From f7630164faafdf666a6b7a5d6d011979619eda9b Mon Sep 17 00:00:00 2001
From: Deeksha Gupta <quic_deegupta@quicinc.com>
Date: Wed, 1 Jun 2022 12:18:20 +0530
Subject: [PATCH] qcacld-3.0: update EHT capabilities IE as per draft 1.5

Update dot11f EHT capabilities IE definitions as per 11be draft 1.5
specification.

Change-Id: I0694587f006225539330a9beac19824ea7a1a708
CRs-Fixed: 3197352
---
 core/mac/src/cfg/cfgUtil/dot11f.frms           | 3 ++-
 core/mac/src/include/dot11f.h                  | 5 +++--
 core/mac/src/sys/legacy/src/utils/src/dot11f.c | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms
index 69ecbd6589..ce3e7d6411 100644
--- a/core/mac/src/cfg/cfgUtil/dot11f.frms
+++ b/core/mac/src/cfg/cfgUtil/dot11f.frms
@@ -3260,7 +3260,8 @@ IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0x6C)
 	restricted_twt: 1;
 	scs_traffic_desc: 1;
 	max_mpdu_len: 2;
-	reserved: 8;
+	max_a_mpdu_len_exponent_ext: 1;
+	reserved: 7;
     }
     {
 	reserved2: 1;
diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h
index f7884a5627..f66142defe 100644
--- a/core/mac/src/include/dot11f.h
+++ b/core/mac/src/include/dot11f.h
@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Jun  1 12:12:18 2022 from the following file(s):
+ * Wed Jun  1 12:17:12 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -8826,7 +8826,8 @@ typedef struct sDot11fIEeht_cap {
 	uint16_t       restricted_twt:1;
 	uint16_t     scs_traffic_desc:1;
 	uint16_t         max_mpdu_len:2;
-	uint16_t             reserved:8;
+	uint16_t max_a_mpdu_len_exponent_ext:1;
+	uint16_t             reserved:7;
 	uint32_t            reserved2:1;
 	uint32_t  support_320mhz_6ghz:1;
 	uint32_t  ru_242tone_wt_20mhz:1;
diff --git a/core/mac/src/sys/legacy/src/utils/src/dot11f.c b/core/mac/src/sys/legacy/src/utils/src/dot11f.c
index 02c33fda50..b8b40d6178 100644
--- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c
+++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c
@@ -25,7 +25,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Jun  1 12:12:18 2022 from the following file(s):
+ * Wed Jun  1 12:17:12 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -8665,7 +8665,8 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx,
 	pDst->restricted_twt = tmp78__ >> 4 & 0x1;
 	pDst->scs_traffic_desc = tmp78__ >> 5 & 0x1;
 	pDst->max_mpdu_len = tmp78__ >> 6 & 0x3;
-	pDst->reserved = tmp78__ >> 8 & 0xff;
+	pDst->max_a_mpdu_len_exponent_ext = tmp78__ >> 8 & 0x1;
+	pDst->reserved = tmp78__ >> 9 & 0x7f;
 	if (unlikely(ielen < 4)) {
 		pDst->present = 0;
 		return DOT11F_INCOMPLETE_IE;
@@ -28309,7 +28310,8 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx,
 		tmp195__ |= (pSrc->restricted_twt << 4);
 		tmp195__ |= (pSrc->scs_traffic_desc << 5);
 		tmp195__ |= (pSrc->max_mpdu_len << 6);
-		tmp195__ |= (pSrc->reserved << 8);
+		tmp195__ |= (pSrc->max_a_mpdu_len_exponent_ext << 8);
+		tmp195__ |= (pSrc->reserved << 9);
 		if (unlikely(nBuf < 2))
 			return DOT11F_INCOMPLETE_IE;