Browse Source

qcacld-3.0: Update EHT operation/capabilities IE per draft 2.0

Update dot11f EHT operation/capabilities IE definitions as
per 11be draft 2.0 specification.

Change-Id: I3aa8d0cccb08a957eeb10cafa932779a4c0516ec
CRs-Fixed: 3217855
Paul Zhang 2 years ago
parent
commit
85e1583dbf

+ 18 - 3
core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -3291,7 +3291,9 @@ IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0x6C)
 	scs_traffic_desc: 1;
 	max_mpdu_len: 2;
 	max_a_mpdu_len_exponent_ext: 1;
-	reserved: 7;
+	eht_trs_support: 1;
+	txop_return_support_txop_share_m2: 1;
+	reserved: 5;
     }
     {
 	reserved2: 1;
@@ -3392,10 +3394,23 @@ IE eht_op (EID_EXTN_ID_ELEMENT) OUI (0x6A)
     {
         eht_op_information_present: 1;
 	disabled_sub_chan_bitmap_present: 1;
-	reserved: 6;
+	eht_default_pe_duration: 1;
+	group_addr_bu_indication_limit: 1;
+	group_addr_bu_indication_exponent: 2;
+	reserved: 2;
     }
     {
-        channel_width: 3;
+	basic_rx_max_nss_for_mcs_0_to_7: 4;
+	basic_tx_max_nss_for_mcs_0_to_7: 4;
+	basic_rx_max_nss_for_mcs_8_and_9: 4;
+	basic_tx_max_nss_for_mcs_8_and_9: 4;
+	basic_rx_max_nss_for_mcs_10_and_11: 4;
+	basic_tx_max_nss_for_mcs_10_and_11: 4;
+	basic_rx_max_nss_for_mcs_12_and_13: 4;
+	basic_tx_max_nss_for_mcs_12_and_13: 4;
+    }
+    {
+	channel_width: 3;
 	reserved_1: 5;
     }
     ccfs0, 1;

+ 25 - 12
core/mac/src/include/dot11f.h

@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Thu Jun 16 20:13:08 2022 from the following file(s):
+ * Mon Jun 27 14:45:04 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -8787,7 +8787,9 @@ typedef struct sDot11fIEeht_cap {
 	uint16_t     scs_traffic_desc:1;
 	uint16_t         max_mpdu_len:2;
 	uint16_t max_a_mpdu_len_exponent_ext:1;
-	uint16_t             reserved:7;
+	uint16_t      eht_trs_support:1;
+	uint16_t txop_return_support_txop_share_m2:1;
+	uint16_t             reserved:5;
 	uint32_t            reserved2:1;
 	uint32_t  support_320mhz_6ghz:1;
 	uint32_t  ru_242tone_wt_20mhz:1;
@@ -8904,7 +8906,18 @@ typedef struct sDot11fIEeht_op {
 	uint8_t             present;
 	uint8_t eht_op_information_present:1;
 	uint8_t disabled_sub_chan_bitmap_present:1;
-	uint8_t             reserved:6;
+	uint8_t eht_default_pe_duration:1;
+	uint8_t group_addr_bu_indication_limit:1;
+	uint8_t group_addr_bu_indication_exponent:2;
+	uint8_t             reserved:2;
+	uint32_t basic_rx_max_nss_for_mcs_0_to_7:4;
+	uint32_t basic_tx_max_nss_for_mcs_0_to_7:4;
+	uint32_t basic_rx_max_nss_for_mcs_8_and_9:4;
+	uint32_t basic_tx_max_nss_for_mcs_8_and_9:4;
+	uint32_t basic_rx_max_nss_for_mcs_10_and_11:4;
+	uint32_t basic_tx_max_nss_for_mcs_10_and_11:4;
+	uint32_t basic_rx_max_nss_for_mcs_12_and_13:4;
+	uint32_t basic_tx_max_nss_for_mcs_12_and_13:4;
 	uint8_t        channel_width:3;
 	uint8_t           reserved_1:5;
 	uint8_t             ccfs0;
@@ -8915,9 +8928,9 @@ typedef struct sDot11fIEeht_op {
 #define DOT11F_EID_EHT_OP (255)
 
 /* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_EHT_OP_MIN_LEN (4)
+#define DOT11F_IE_EHT_OP_MIN_LEN (8)
 
-#define DOT11F_IE_EHT_OP_MAX_LEN (6)
+#define DOT11F_IE_EHT_OP_MAX_LEN (10)
 
 #ifdef __cplusplus
 extern "C" {
@@ -10339,13 +10352,13 @@ uint32_t dot11f_get_packed_ie_sec_chan_offset_ele(
 
 /* EID 255 (0xff) Extended EID 39 (0x27) */
 typedef struct sDot11fIEspatial_reuse {
-	uint8_t         present;
+	uint8_t             present;
 	uint8_t         psr_disallow:1;
-	uint8_t         non_srg_pd_sr_disallow:1;
-	uint8_t         non_srg_offset_present:1;
-	uint8_t         srg_info_present:1;
-	uint8_t         sr_value15_allow:1;
-	uint8_t         reserved:3;
+	uint8_t non_srg_pd_sr_disallow:1;
+	uint8_t non_srg_offset_present:1;
+	uint8_t     srg_info_present:1;
+	uint8_t     sr_value15_allow:1;
+	uint8_t             reserved:3;
 	union {
 		struct {
 			uint8_t non_srg_pd_max_offset;
@@ -10375,7 +10388,7 @@ __must_check uint32_t dot11f_unpack_ie_spatial_reuse(
 	tpAniSirGlobal,
 	uint8_t *,
 	uint8_t,
-	tDot11fIEspatial_reuse *,
+	tDot11fIEspatial_reuse*,
 	bool);
 
 uint32_t dot11f_pack_ie_spatial_reuse(

File diff suppressed because it is too large
+ 312 - 291
core/mac/src/sys/legacy/src/utils/src/dot11f.c


Some files were not shown because too many files changed in this diff