X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FIp4Dxe%2FIp4Config2Impl.h;h=1716dde399ab59ce0aecbeeb455b4be861bef081;hp=77bdc8dcb645ccd067726fc4edff8f2d95df3934;hb=c0fd7f734e2d33e22215899b40a47b843129541d;hpb=7648748e99eeeadec38fda7568adb260c4acc861

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
index 77bdc8dcb6..1716dde399 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
@@ -1,16 +1,10 @@
 /** @file
   Definitions for EFI IPv4 Configuration II Protocol implementation.
 
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -25,13 +19,9 @@
 #define DATA_ATTRIB_SIZE_FIXED              0x1
 #define DATA_ATTRIB_VOLATILE                0x2
 
-#define DHCP_TAG_PARA_LIST             55
-#define DHCP_TAG_NETMASK               1
-#define DHCP_TAG_ROUTER                3
-#define DHCP_TAG_DNS_SERVER            6
-
 #define DATA_ATTRIB_SET(Attrib, Bits)       (BOOLEAN)((Attrib) & (Bits))
 #define SET_DATA_ATTRIB(Attrib, Bits)       ((Attrib) |= (Bits))
+#define REMOVE_DATA_ATTRIB(Attrib, Bits)    ((Attrib) &= (~Bits))
 
 typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE;
 
@@ -74,7 +64,7 @@ typedef struct _IP4_CONFIG2_INSTANCE IP4_CONFIG2_INSTANCE;
                                8 bytes.
   @retval EFI_SUCCESS          The specified configuration data for the EFI IPv4
                                network stack was set successfully.
-  
+
 **/
 typedef
 EFI_STATUS
@@ -91,14 +81,14 @@ EFI_STATUS
   @param[in, out] DataSize On input, in bytes, the size of Data. On output, in
                            bytes, the size of buffer required to store the specified
                            configuration data.
-  @param[in]      Data     The data buffer in which the configuration data is returned.  
+  @param[in]      Data     The data buffer in which the configuration data is returned.
                            Ignored if DataSize is ZERO.
 
   @retval EFI_BUFFER_TOO_SMALL The size of Data is too small for the specified
-                               configuration data, and the required size is 
+                               configuration data, and the required size is
                                returned in DataSize.
-  @retval EFI_SUCCESS          The specified configuration data was obtained successfully.                               
-  
+  @retval EFI_SUCCESS          The specified configuration data was obtained successfully.
+
 **/
 typedef
 EFI_STATUS
@@ -155,7 +145,7 @@ typedef struct {
 #pragma pack()
 
 typedef struct {
-  EFI_IP4_CONFIG2_POLICY                   Policy;               ///< manual or automatic  
+  EFI_IP4_CONFIG2_POLICY                   Policy;               ///< manual or automatic
   EFI_IP4_CONFIG2_MANUAL_ADDRESS           *ManualAddress;       ///< IP addresses
   UINT32                                   ManualAddressCount;   ///< IP addresses count
   EFI_IPv4_ADDRESS                         *GatewayAddress;      ///< Gateway address
@@ -181,7 +171,7 @@ struct _IP4_CONFIG2_INSTANCE {
   EFI_IP4_CONFIG2_PROTOCOL                  Ip4Config2;
 
   EFI_IP4_CONFIG2_INTERFACE_INFO            InterfaceInfo;
-  EFI_IP4_CONFIG2_POLICY                    Policy;  
+  EFI_IP4_CONFIG2_POLICY                    Policy;
   IP4_CONFIG2_DATA_ITEM                     DataItem[Ip4Config2DataTypeMaximum];
 
   EFI_EVENT                                 Dhcp4SbNotifyEvent;
@@ -194,7 +184,7 @@ struct _IP4_CONFIG2_INSTANCE {
   UINT32                                    FailedIaAddressCount;
   EFI_IPv4_ADDRESS                          *DeclineAddress;
   UINT32                                    DeclineAddressCount;
-  
+
   IP4_FORM_CALLBACK_INFO                    CallbackInfo;
 
   IP4_CONFIG2_NVDATA                        Ip4NvData;
@@ -202,7 +192,7 @@ struct _IP4_CONFIG2_INSTANCE {
 
 //
 // Configure the DHCP to request the routers and netmask
-// from server. The DHCP_TAG_NETMASK is included in Head.
+// from server. The DHCP4_TAG_NETMASK is included in Head.
 //
 #pragma pack(1)
 typedef struct {
@@ -239,7 +229,7 @@ Ip4Config2ReadConfigData (
 
   @param[in]  Instance           The IP4 config2 instance to configure.
 
-  @retval EFI_SUCCESS            The auto configuration is successfull started.
+  @retval EFI_SUCCESS            The auto configuration is successfully started.
   @retval Others                 Failed to start auto configuration.
 
 **/