Adopt new IPv4/IPv6 device path for network modules.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiConfigNVDataStruc.h

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 7c26ff377d1bccbe579514f8b5ef5a55ed00c1da..7c2e4e65fa8e752a66f804f09310c9c2f35446dc 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_NVDATASTRUC_H_\r
 #define _ISCSI_NVDATASTRUC_H_\r
 \r
-#define ISCSI_CONFIG_GUID \\r
-  { \\r
-    0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
-  }\r
+#include <Guid/Ip4IScsiConfigHii.h>\r
 \r
 #define VAR_EQ_TEST_NAME    0x100\r
 \r
@@ -76,6 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define ISCSI_CHAP_SECRET_STORAGE 17\r
 \r
 #define ISCSI_CHAP_NAME_MAX_LEN   126\r
+#define ISCSI_CHAP_NAME_STORAGE   127\r
 \r
 #define ISID_CONFIGURABLE_MIN_LEN 6\r
 #define ISID_CONFIGURABLE_MAX_LEN 12\r
@@ -99,9 +97,9 @@ typedef struct {
   UINT8   TargetInfoFromDhcp;\r
 \r
   UINT8   CHAPType;\r
-  CHAR16  CHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
+  CHAR16  CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
   CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
-  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
+  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
   CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 \r
   CHAR16  IsId[ISID_CONFIGURABLE_STORAGE];\r