UefiCpuPkg: Add PiSmmCpuDxeSmm module X64 files

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiMisc.c

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index 010d2a4800eb3ef5f795bcd8c3a2a0b39fac674e..e7198d5ab04cbb7c79de395d6838aa1a5d43b818 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -1054,7 +1054,7 @@ IScsiGetConfigData (
       // Check the autoconfig path to see whether it should be retried.\r
       //\r
       if (AttemptTmp->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
-          AttemptTmp->AutoConfigureMode != IP_MODE_AUTOCONFIG_SUCCESS) {\r
+          !AttemptTmp->AutoConfigureSuccess) {\r
         if (mPrivate->Ipv6Flag &&\r
             AttemptTmp->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6) {\r
           //\r
@@ -1197,6 +1197,7 @@ IScsiGetConfigData (
 \r
       AttemptConfigData->AutoConfigureMode =\r
         (UINT8) (mPrivate->Ipv6Flag ? IP_MODE_AUTOCONFIG_IP6 : IP_MODE_AUTOCONFIG_IP4);\r
+      AttemptConfigData->AutoConfigureSuccess = FALSE;\r
     }\r
     \r
     //\r
@@ -1400,7 +1401,7 @@ IScsiGetTcpConnDevicePath (
 \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
@@ -1427,19 +1428,19 @@ IScsiGetTcpConnDevicePath (
 \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