NetworkPkg: Refine codes related to Dhcpv4 and Dhcpv6 configuration.

v2:
*Since we have redefined the name of arch types in Dhcp.h for http boot,
it need to change corresponding codes.

Add a new head file Dhcp.h in Mde/Include/IndustryStandard, normalize the
universal option numbers and other network number tags.

Cc: Sriram Subramanian <sriram-s@hpe.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

1 files changed, 1 insertions, 10 deletions

diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.h b/NetworkPkg/IScsiDxe/IScsiDhcp6.h
index 4ca25bd494..1d59d10626 100644
--- a/NetworkPkg/IScsiDxe/IScsiDhcp6.h
+++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.h
@@ -1,7 +1,7 @@
 /** @file

   The header file of iSCSI DHCP6 related configuration routines.

 

-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2016, 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

@@ -15,15 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_DHCP6_H_

 #define _ISCSI_DHCP6_H_

 

-#define DHCP6_OPT_REQUEST_OPTION 6

-#define DHCP6_OPT_VENDOR_INFO    17

-#define DHCP6_OPT_DNS_SERVERS    23

-///

-/// Assigned by IANA, RFC 5970

-///

-#define DHCP6_OPT_BOOT_FILE_URL  59

-#define DHCP6_OPT_BOOT_FILE_PARA 60

-

 #define ISCSI_ROOT_PATH_ID                   "iscsi:"

 #define ISCSI_ROOT_PATH_FIELD_DELIMITER      ':'

 #define ISCSI_ROOT_PATH_ADDR_START_DELIMITER '['