NetworkPkg: Refine codes related to Dhcpv4 and Dhcpv6 configuration.

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6Impl.h

diff --git a/NetworkPkg/Ip6Dxe/Ip6Impl.h b/NetworkPkg/Ip6Dxe/Ip6Impl.h
index 1241e63669dcc77d42be5da7eaecdfa93d9a65ab..9960a9a711786b2864fbfaaedc517e26fbf54339 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Impl.h
+++ b/NetworkPkg/Ip6Dxe/Ip6Impl.h
@@ -1,7 +1,8 @@
 /** @file\r
   Implementation of EFI_IP6_PROTOCOL protocol interfaces and type definitions.\r
 \r
 /** @file\r
   Implementation of EFI_IP6_PROTOCOL protocol interfaces and type definitions.\r
 \r

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -18,6 +19,8 @@
 \r
 #include <Uefi.h>\r
 \r
 \r
 #include <Uefi.h>\r
 \r

+#include <IndustryStandard/Dhcp.h>\r
+\r

 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/ManagedNetwork.h>\r
 #include <Protocol/IpSec.h>\r
 #include <Protocol/ServiceBinding.h>\r
 #include <Protocol/ManagedNetwork.h>\r
 #include <Protocol/IpSec.h>\r


@@ -68,7 +71,6 @@
 //\r
 #define IP6_STATE_UNCONFIGED   0\r
 #define IP6_STATE_CONFIGED     1\r
 //\r
 #define IP6_STATE_UNCONFIGED   0\r
 #define IP6_STATE_CONFIGED     1\r

-#define IP6_STATE_DESTROY      2\r

 \r
 //\r
 // The state of IP6 service. It starts from UNSTARTED. It transits\r
 \r
 //\r
 // The state of IP6 service. It starts from UNSTARTED. It transits\r


@@ -90,6 +92,7 @@
 #define IP6_NO_MAPPING(IpInstance) (!(IpInstance)->Interface->Configured)\r
 \r
 extern EFI_IPSEC2_PROTOCOL *mIpSec;\r
 #define IP6_NO_MAPPING(IpInstance) (!(IpInstance)->Interface->Configured)\r
 \r
 extern EFI_IPSEC2_PROTOCOL *mIpSec;\r

+extern BOOLEAN             mIpSec2Installed;\r

 \r
 //\r
 // IP6_TXTOKEN_WRAP wraps the upper layer's transmit token.\r
 \r
 //\r
 // IP6_TXTOKEN_WRAP wraps the upper layer's transmit token.\r


@@ -157,13 +160,13 @@ struct _IP6_PROTOCOL {
   UINT32                    GroupCount;\r
 \r
   EFI_IP6_CONFIG_DATA       ConfigData;\r
   UINT32                    GroupCount;\r
 \r
   EFI_IP6_CONFIG_DATA       ConfigData;\r

+  BOOLEAN                   InDestroy;\r

 };\r
 \r
 struct _IP6_SERVICE {\r
   UINT32                          Signature;\r
   EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
   INTN                            State;\r
 };\r
 \r
 struct _IP6_SERVICE {\r
   UINT32                          Signature;\r
   EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;\r
   INTN                            State;\r

-  BOOLEAN                         InDestroy;\r

 \r
   //\r
   // List of all the IP instances and interfaces, and default\r
 \r
   //\r
   // List of all the IP instances and interfaces, and default\r