From b941c34ef859971e29683ffb57c309e24e6a96be Mon Sep 17 00:00:00 2001 From: "Wang, Fan" Date: Tue, 6 Jun 2017 18:51:35 +0800 Subject: 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 Reviewed-by: Fu Siyuan Reviewed-by: Ye Ting --- MdePkg/Include/Protocol/Supplicant.h | 6 +++++- MdePkg/Include/Protocol/WiFi2.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MdePkg/Include/Protocol/Supplicant.h b/MdePkg/Include/Protocol/Supplicant.h index 37e4c7ec77..9cd63f82d1 100644 --- a/MdePkg/Include/Protocol/Supplicant.h +++ b/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.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
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/MdePkg/Include/Protocol/WiFi2.h b/MdePkg/Include/Protocol/WiFi2.h index fc4da5cf21..e370059b40 100644 --- a/MdePkg/Include/Protocol/WiFi2.h +++ b/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.
+ Copyright (c) 2017, Intel Corporation. All rights reserved.
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; /// -- cgit