summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWang, Fan <fan.wang@intel.com>2017-06-06 18:51:35 +0800
committerGuo Mang <mang.guo@intel.com>2017-07-12 11:24:56 +0800
commit4a981714bc3e93830775331d10e85fc539d67b9b (patch)
tree1ad6989a12609bdf6ffdd00fa19c989a07af3533
parent5973449aea2ecd90cddea7a54932bd77e19a4263 (diff)
downloadedk2-platforms-4a981714bc3e93830775331d10e85fc539d67b9b.tar.xz
MdePkg: update Wi-Fi/Supplicant header files to meet UEFI 2.7.
This patch is used to update supplicant.h and wifi2.h to meet UEFI 2.7 definition. Add EfiSupplicant80211PMK field in EFI_SUPPLICANT_DATA_TYPE and change **NetworkDesc to NetworkDesc[1] in EFI_80211_GET_NETWORKS_RESULT. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wang Fan <fan.wang@intel.com> Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Ye Ting <ting.ye@intel.com> (cherry picked from commit b941c34ef859971e29683ffb57c309e24e6a96be)
-rw-r--r--Core/MdePkg/Include/Protocol/Supplicant.h6
-rw-r--r--Core/MdePkg/Include/Protocol/WiFi2.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/Core/MdePkg/Include/Protocol/Supplicant.h b/Core/MdePkg/Include/Protocol/Supplicant.h
index 37e4c7ec77..9cd63f82d1 100644
--- a/Core/MdePkg/Include/Protocol/Supplicant.h
+++ b/Core/MdePkg/Include/Protocol/Supplicant.h
@@ -1,7 +1,7 @@
/** @file
This file defines the EFI Supplicant Protocol.
- Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2017, 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
@@ -152,6 +152,10 @@ typedef enum {
// EFI_SUPPLICANT_GTK_LIST.
//
EfiSupplicant80211IGTK,
+ //
+ // 802.11 PMK. The corresponding Data is 32 bytes pairwise master key.
+ //
+ EfiSupplicant80211PMK,
EfiSupplicantDataTypeMaximum
} EFI_SUPPLICANT_DATA_TYPE;
diff --git a/Core/MdePkg/Include/Protocol/WiFi2.h b/Core/MdePkg/Include/Protocol/WiFi2.h
index fc4da5cf21..e370059b40 100644
--- a/Core/MdePkg/Include/Protocol/WiFi2.h
+++ b/Core/MdePkg/Include/Protocol/WiFi2.h
@@ -1,7 +1,7 @@
/** @file
This file defines the EFI Wireless MAC Connection II Protocol.
- Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2017, 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
@@ -202,7 +202,7 @@ typedef struct {
// The NetworkDesc is a pointer to an array of EFI_80211_NETWORK_DESCRIPTION
// instances. It is caller's responsibility to free this buffer.
//
- EFI_80211_NETWORK_DESCRIPTION **NetworkDesc;
+ EFI_80211_NETWORK_DESCRIPTION NetworkDesc[1];
} EFI_80211_GET_NETWORKS_RESULT;
///