MdePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdePkg / Include / Protocol / WiFi.h

diff --git a/MdePkg/Include/Protocol/WiFi.h b/MdePkg/Include/Protocol/WiFi.h
index 8e9fb3835d44cd049f978ea3acd29e78665ca83b..e82607caa410bd39053eee300a687164f77f7618 100644 (file)
--- a/MdePkg/Include/Protocol/WiFi.h
+++ b/MdePkg/Include/Protocol/WiFi.h
@@ -3,14 +3,8 @@
   network applications (and drivers) to establish wireless connection with an access\r
   point (AP).\r
 \r
-  Copyright (c) 2015, 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
-\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
+  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Revision Reference:\r
   This Protocol is introduced in UEFI Specification 2.5\r
@@ -20,6 +14,8 @@
 #ifndef __EFI_WIFI_PROTOCOL_H__\r
 #define __EFI_WIFI_PROTOCOL_H__\r
 \r
+#include <Protocol/WiFi2.h>\r
+\r
 #define EFI_WIRELESS_MAC_CONNECTION_PROTOCOL_GUID \\r
   { \\r
     0xda55bc9, 0x45f8, 0x4bb4, {0x87, 0x19, 0x52, 0x24, 0xf1, 0x8a, 0x4d, 0x45 } \\r
@@ -27,16 +23,6 @@
 \r
 typedef struct _EFI_WIRELESS_MAC_CONNECTION_PROTOCOL EFI_WIRELESS_MAC_CONNECTION_PROTOCOL;\r
 \r
-///\r
-/// EFI_80211_BSS_TYPE\r
-///\r
-typedef enum {\r
-  IeeeInfrastructureBSS,\r
-  IeeeIndependentBSS,\r
-  IeeeMeshBSS,\r
-  IeeeAnyBss\r
-} EFI_80211_BSS_TYPE;\r
-\r
 ///\r
 /// EFI_80211_ACC_NET_TYPE\r
 ///\r
@@ -145,13 +131,6 @@ typedef enum {
   AuthenticateInvalidParameter\r
 } EFI_80211_AUTHENTICATE_RESULT_CODE;\r
 \r
-///\r
-/// EFI_80211_MAC_ADDRESS\r
-///\r
-typedef struct {\r
-  UINT8                              Addr[6];\r
-} EFI_80211_MAC_ADDRESS;\r
-\r
 ///\r
 /// EFI_80211_ELEMENT_HEADER\r
 ///\r