NetworkPkg: Replace BSD License with BSD+Patent License

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

diff --git a/NetworkPkg/Ip6Dxe/Ip6Impl.h b/NetworkPkg/Ip6Dxe/Ip6Impl.h
index 1241e63669dcc77d42be5da7eaecdfa93d9a65ab..d46ee600d5cc2fe6ffacbf96810dbace3b1bde5f 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Impl.h
+++ b/NetworkPkg/Ip6Dxe/Ip6Impl.h
@@ -1,15 +1,10 @@
 /** @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
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -18,6 +13,8 @@
 \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
@@ -68,7 +65,6 @@
 //\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
@@ -90,6 +86,7 @@
 #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
@@ -157,13 +154,13 @@ struct _IP6_PROTOCOL {
   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
-  BOOLEAN                         InDestroy;\r
 \r
   //\r
   // List of all the IP instances and interfaces, and default\r