\r
PathLen = DevicePathNodeLength (&DPathNode->Ipv4);\r
\r
- if (PathLen == IPv4_NODE_LEN_NEW_VERSIONS) { \r
+ if (PathLen == IP4_NODE_LEN_NEW_VERSIONS) { \r
\r
IP4_COPY_ADDRESS (\r
&DPathNode->Ipv4.GatewayIpAddress,\r
\r
PathLen = DevicePathNodeLength (&DPathNode->Ipv6);\r
\r
- if (PathLen == IPv6_NODE_LEN_NEW_VERSIONS ) { \r
+ if (PathLen == IP6_NODE_LEN_NEW_VERSIONS ) { \r
\r
DPathNode->Ipv6.IpAddressOrigin = 0;\r
DPathNode->Ipv6.PrefixLength = IP6_PREFIX_LENGTH;\r
ZeroMem (&DPathNode->Ipv6.GatewayIpAddress, sizeof (EFI_IPv6_ADDRESS));\r
}\r
- else if (PathLen == IPv6_NODE_LEN_OLD_VERSIONS) { \r
+ else if (PathLen == IP6_NODE_LEN_OLD_VERSIONS) { \r
\r
//\r
// StaticIPAddress is a field in old versions of IPv6_DEVICE_PATH, while ignored in new \r
// version. Set StaticIPAddress through its' offset in old IPv6_DEVICE_PATH.\r
//\r
- *((UINT8 *)(&DPathNode->Ipv6) + IPv6_OLD_IPADDRESS_OFFSET) = \r
+ *((UINT8 *)(&DPathNode->Ipv6) + IP6_OLD_IPADDRESS_OFFSET) = \r
(BOOLEAN) (!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);\r
}\r
\r
///\r
/// IPv4 Device Path Node Length\r
///\r
-#define IPv4_NODE_LEN_NEW_VERSIONS 27\r
+#define IP4_NODE_LEN_NEW_VERSIONS 27\r
\r
///\r
/// IPv6 Device Path Node Length\r
///\r
-#define IPv6_NODE_LEN_OLD_VERSIONS 43\r
-#define IPv6_NODE_LEN_NEW_VERSIONS 60\r
+#define IP6_NODE_LEN_OLD_VERSIONS 43\r
+#define IP6_NODE_LEN_NEW_VERSIONS 60\r
\r
///\r
/// The ignored field StaticIpAddress's offset in old IPv6 Device Path\r
///\r
-#define IPv6_OLD_IPADDRESS_OFFSET 42\r
+#define IP6_OLD_IPADDRESS_OFFSET 42\r
\r
#pragma pack(1)\r
typedef struct _ISCSI_SESSION_CONFIG_NVDATA {\r