1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch] MdePkg: update head files to meet UEFI 2.7

fanwang2 posted 1 patch 7 years, 6 months ago
Failed in applying to current master (apply log)
MdePkg/Include/Protocol/Supplicant.h | 6 +++++-
MdePkg/Include/Protocol/WiFi2.h      | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
[edk2] [Patch] MdePkg: update head files to meet UEFI 2.7
Posted by fanwang2 7 years, 6 months ago 
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.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Fan <fan.wang@intel.com>
---
 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 37e4c7e..2d7eed6 100644
--- a/MdePkg/Include/Protocol/Supplicant.h
+++ b/MdePkg/Include/Protocol/Supplicant.h
@@ -1,9 +1,9 @@
 /** @file
   This file defines the EFI Supplicant 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
   http://opensource.org/licenses/bsd-license.php
 
@@ -150,10 +150,14 @@ typedef enum {
   //
   // 802.11 Integrity GTK. The corresponding Data is of type
   // EFI_SUPPLICANT_GTK_LIST.
   //
   EfiSupplicant80211IGTK,
+  //
+  // 802.11 PMK. The corresponding Data is 32 bytes pairwise master key.
+  //
+  EfiSupplicant80211PMK,
   EfiSupplicantDataTypeMaximum
 } EFI_SUPPLICANT_DATA_TYPE;
 
 ///
 /// EFI_80211_LINK_STATE
diff --git a/MdePkg/Include/Protocol/WiFi2.h b/MdePkg/Include/Protocol/WiFi2.h
index fc4da5c..e370059 100644
--- a/MdePkg/Include/Protocol/WiFi2.h
+++ b/MdePkg/Include/Protocol/WiFi2.h
@@ -1,9 +1,9 @@
 /** @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
   http://opensource.org/licenses/bsd-license.php
 
@@ -200,11 +200,11 @@ typedef struct {
   UINT8                                     NumOfNetworkDesc;
   //
   // 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;
 
 ///
 /// EFI_80211_GET_NETWORKS_TOKEN
 ///
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] MdePkg: update head files to meet UEFI 2.7
Posted by Fu, Siyuan 7 years, 6 months ago 
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>


-----Original Message-----
From: Wang, Fan 
Sent: 2017年6月6日 18:52
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wang, Fan <fan.wang@intel.com>
Subject: [Patch] MdePkg: update head 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.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Fan <fan.wang@intel.com>
---
 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 37e4c7e..2d7eed6 100644
--- a/MdePkg/Include/Protocol/Supplicant.h
+++ b/MdePkg/Include/Protocol/Supplicant.h
@@ -1,9 +1,9 @@
 /** @file
   This file defines the EFI Supplicant 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
   http://opensource.org/licenses/bsd-license.php
 
@@ -150,10 +150,14 @@ typedef enum {
   //
   // 802.11 Integrity GTK. The corresponding Data is of type
   // EFI_SUPPLICANT_GTK_LIST.
   //
   EfiSupplicant80211IGTK,
+  //
+  // 802.11 PMK. The corresponding Data is 32 bytes pairwise master key.
+  //
+  EfiSupplicant80211PMK,
   EfiSupplicantDataTypeMaximum
 } EFI_SUPPLICANT_DATA_TYPE;
 
 ///
 /// EFI_80211_LINK_STATE
diff --git a/MdePkg/Include/Protocol/WiFi2.h b/MdePkg/Include/Protocol/WiFi2.h index fc4da5c..e370059 100644
--- a/MdePkg/Include/Protocol/WiFi2.h
+++ b/MdePkg/Include/Protocol/WiFi2.h
@@ -1,9 +1,9 @@
 /** @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
   http://opensource.org/licenses/bsd-license.php
 
@@ -200,11 +200,11 @@ typedef struct {
   UINT8                                     NumOfNetworkDesc;
   //
   // 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;
 
 ///
 /// EFI_80211_GET_NETWORKS_TOKEN
 ///
--
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] MdePkg: update head files to meet UEFI 2.7
Posted by Ye, Ting 7 years, 6 months ago 
Reviewed-by: Ye Ting <ting.ye@intel.com>

-----Original Message-----
From: Wang, Fan 
Sent: Tuesday, June 06, 2017 6:52 PM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wang, Fan <fan.wang@intel.com>
Subject: [Patch] MdePkg: update head 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.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Fan <fan.wang@intel.com>
---
 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 37e4c7e..2d7eed6 100644
--- a/MdePkg/Include/Protocol/Supplicant.h
+++ b/MdePkg/Include/Protocol/Supplicant.h
@@ -1,9 +1,9 @@
 /** @file
   This file defines the EFI Supplicant 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
   http://opensource.org/licenses/bsd-license.php
 
@@ -150,10 +150,14 @@ typedef enum {
   //
   // 802.11 Integrity GTK. The corresponding Data is of type
   // EFI_SUPPLICANT_GTK_LIST.
   //
   EfiSupplicant80211IGTK,
+  //
+  // 802.11 PMK. The corresponding Data is 32 bytes pairwise master key.
+  //
+  EfiSupplicant80211PMK,
   EfiSupplicantDataTypeMaximum
 } EFI_SUPPLICANT_DATA_TYPE;
 
 ///
 /// EFI_80211_LINK_STATE
diff --git a/MdePkg/Include/Protocol/WiFi2.h b/MdePkg/Include/Protocol/WiFi2.h index fc4da5c..e370059 100644
--- a/MdePkg/Include/Protocol/WiFi2.h
+++ b/MdePkg/Include/Protocol/WiFi2.h
@@ -1,9 +1,9 @@
 /** @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
   http://opensource.org/licenses/bsd-license.php
 
@@ -200,11 +200,11 @@ typedef struct {
   UINT8                                     NumOfNetworkDesc;
   //
   // 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;
 
 ///
 /// EFI_80211_GET_NETWORKS_TOKEN
 ///
--
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.