MdeModulePkg: Fix issue about current Ip4Dxe implementation for DHCP DORA process

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index f6d41b87a5d8ee6c5252b57a7f49cd02b0170865..ef881d88275bbdfaebca5ce5aa15dff6611d208a 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -1,8 +1,8 @@
 /** @file\r
   The header file of IScsiConfig.c.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -15,16 +15,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_CONFIG_H_\r
 #define _ISCSI_CONFIG_H_\r
 \r
+#include <Guid/MdeModuleHii.h>\r
+#include <Protocol/HiiConfigRouting.h>\r
 #include <Library/HiiLib.h>\r
-#include <Library/ExtendedHiiLib.h>\r
-#include <Library/IfrSupportLib.h>\r
-#include <Library/ExtendedIfrSupportLib.h>\r
+#include <Library/DevicePathLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/NetLib.h>\r
 \r
 extern UINT8  IScsiConfigDxeBin[];\r
-extern UINT8  IScsiDxeStrings[];\r
+extern UINT8  IScsi4DxeStrings[];\r
 \r
 #define ISCSI_INITATOR_NAME_VAR_NAME        L"I_NAME"\r
 \r
@@ -70,6 +70,7 @@ extern UINT8  IScsiDxeStrings[];
 typedef struct _ISCSI_MAC_INFO {\r
   EFI_MAC_ADDRESS Mac;\r
   UINT8           Len;\r
+  UINT16          VlanId;\r
 } ISCSI_MAC_INFO;\r
 \r
 typedef struct _ISCSI_DEVICE_LIST {\r
@@ -102,6 +103,18 @@ typedef struct _ISCSI_FORM_CALLBACK_INFO {
   ISCSI_CONFIG_FORM_ENTRY          *Current;\r
 } ISCSI_FORM_CALLBACK_INFO;\r
 \r
+#pragma pack(1)\r
+\r
+///\r
+/// HII specific Vendor Device Path definition.\r
+///\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH             VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL       End;\r
+} HII_VENDOR_DEVICE_PATH;\r
+\r
+#pragma pack()\r
+\r
 /**\r
   Updates the iSCSI configuration form to add/delete an entry for the iSCSI\r
   device specified by the Controller.\r