2 files changed, 24 insertions, 10 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 61c407e6ff..621fbc00e4 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -814,15 +814,24 @@ IScsiGetTcpConnDevicePath (
       DPathNode->Ipv4.StaticIpAddress = 
         (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
 
-      IP4_COPY_ADDRESS (
-        &DPathNode->Ipv4.GatewayIpAddress,
-        &Session->ConfigData.NvData.Gateway
-        );
-
-      IP4_COPY_ADDRESS (
-        &DPathNode->Ipv4.SubnetMask,
-        &Session->ConfigData.NvData.SubnetMask
-        );
+      //
+      //  Add a judgement here to support previous versions of IPv4_DEVICE_PATH.
+      //  In previous versions of IPv4_DEVICE_PATH, GatewayIpAddress and SubnetMask
+      //  do not exist.
+      //  In new version of IPv4_DEVICE_PATH, structcure length is 27.
+      //
+      if (DevicePathNodeLength (&DPathNode->Ipv4) == IPv4_NODE_LEN_NEW_VERSIONS) {  
+
+        IP4_COPY_ADDRESS (
+          &DPathNode->Ipv4.GatewayIpAddress,
+          &Session->ConfigData.NvData.Gateway
+          );
+
+        IP4_COPY_ADDRESS (
+          &DPathNode->Ipv4.SubnetMask,
+          &Session->ConfigData.NvData.SubnetMask
+          );
+      }
 
       break;
     }
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
index 052a90f8d4..0bb7da070d 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
@@ -1,7 +1,7 @@
 /** @file
   Miscellaneous definitions for iSCSI driver.
 
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -19,6 +19,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 typedef struct _ISCSI_SESSION_CONFIG_DATA ISCSI_SESSION_CONFIG_DATA;
 
+///
+/// IPv4 Device Path Node Length
+///
+#define IPv4_NODE_LEN_NEW_VERSIONS    27
+
 #pragma pack(1)
 typedef struct {
   BOOLEAN           Enabled;