Browse Source

qcacld-3.0: Modify mlo and remove sta profile from dot11f.frms

Modify mlo and remove sta profile from dot11f.frms.

Change-Id: Ic91b44950149c3fa821c29acc07a92341ebc8054
CRs-Fixed: 3209300
Paul Zhang 2 years ago
parent
commit
3904e7a125

+ 1 - 79
core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -3778,87 +3778,9 @@ IE non_inheritance (EID_EXTN_ID_ELEMENT) OUI (0x38)
     data[0..255];
 }
 
-IE sta_profile (0)
-{
-    data[0..255];
-}
-
 IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x6B)
 {
-    {
-        type: 3;
-        reserved: 1;
-        link_id_info_present: 1;
-        bss_param_change_cnt_present: 1;
-        medium_sync_delay_info_present: 1;
-        eml_capab_present: 1;
-        mld_capab_present: 1;
-        reserved_1: 7;
-    }
-    common_info_length, 1;
-    mld_mac_addr[6];
-    OPTIONAL UNION link_id_info (DISCRIMINATOR link_id_info_present)
-    {
-        info (link_id_info_present IS 1)
-        {
-            {
-                link_id:  4;
-                reserved: 4;
-            }
-        }
-    };
-    OPTIONAL UNION bss_param_change_cnt (DISCRIMINATOR bss_param_change_cnt_present)
-    {
-        info (bss_param_change_cnt_present IS 1)
-        {
-            bss_param_change_count, 1;
-        }
-    };
-    OPTIONAL UNION medium_sync_delay_info (DISCRIMINATOR medium_sync_delay_info_present)
-    {
-        info (medium_sync_delay_info_present IS 1)
-        {
-            {
-                medium_sync_duration: 8;
-                medium_sync_ofdm_ed_thresh: 4;
-                medium_sync_max_txop_num: 4;
-            }
-        }
-    };
-    OPTIONAL UNION eml_capabilities (DISCRIMINATOR eml_capab_present)
-    {
-        info (eml_capab_present IS 1)
-        {
-            {
-                emlsr_support: 1;
-                emlsr_padding_delay: 3;
-                emlsr_transition_delay: 3;
-                emlmr_support: 1;
-                emlmr_delay: 3;
-                transition_timeout: 4;
-                reserved: 1;
-            }
-            {
-                emlmr_rx_nss: 4;
-                emlmr_tx_nss: 4;
-            }
-        }
-    };
-    OPTIONAL UNION mld_capabilities (DISCRIMINATOR mld_capab_present)
-    {
-        info (mld_capab_present IS 1)
-        {
-            {
-                max_simultaneous_link_num: 4;
-                srs_support: 1;
-                tid_link_map_supported: 2;
-                str_freq_separation: 5;
-                aar_support: 1;
-                reserved: 3;
-            }
-        }
-    };
-    OPTIE sta_profile[2];
+    data[9..255];
 }
 
 /////////////////////////////////////////////////////////////////////////////

+ 5 - 96
core/mac/src/include/dot11f.h

@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Jun  1 12:17:12 2022 from the following file(s):
+ * Fri Jun 10 20:28:00 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -4597,46 +4597,6 @@ uint32_t dot11f_get_packed_ie_req_mac_addr(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 0 (0x00) */
-typedef struct sDot11fIEsta_profile {
-	uint8_t             present;
-	uint8_t             num_data;
-	uint8_t             data[255];
-} tDot11fIEsta_profile;
-
-#define DOT11F_EID_STA_PROFILE (0)
-
-/* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_STA_PROFILE_MIN_LEN (0)
-
-#define DOT11F_IE_STA_PROFILE_MAX_LEN (255)
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* C++ */
-__must_check uint32_t dot11f_unpack_ie_sta_profile(
-	tpAniSirGlobal,
-	uint8_t *,
-	uint8_t,
-	tDot11fIEsta_profile*,
-	bool);
-
-uint32_t dot11f_pack_ie_sta_profile(
-	tpAniSirGlobal,
-	tDot11fIEsta_profile *,
-	uint8_t *,
-	uint32_t,
-	uint32_t*);
-
-uint32_t dot11f_get_packed_ie_sta_profile(
-	tpAniSirGlobal,
-	tDot11fIEsta_profile *,
-	uint32_t*);
-
-#ifdef __cplusplus
-}; /* End extern "C". */
-#endif /* C++ */
-
 /* EID 255 (0xff) Extended EID 89 (0x59) */
 typedef struct sDot11fIEtclas_mask {
 	uint8_t             present;
@@ -9917,60 +9877,9 @@ uint32_t dot11f_get_packed_ie_max_chan_switch_time(
 
 /* EID 255 (0xff) Extended EID 107 (0x6b) */
 typedef struct sDot11fIEmlo_ie {
-	uint8_t                     present;
-	uint16_t                         type:3;
-	uint16_t                     reserved:1;
-	uint16_t         link_id_info_present:1;
-	uint16_t bss_param_change_cnt_present:1;
-	uint16_t medium_sync_delay_info_present:1;
-	uint16_t            eml_capab_present:1;
-	uint16_t            mld_capab_present:1;
-	uint16_t                   reserved_1:7;
-	uint8_t                     common_info_length;
-	uint8_t                     mld_mac_addr[6];
-	union {
-		struct {
-			uint8_t   link_id:4;
-			uint8_t  reserved:4;
-		} info; /* link_id_info_present = 1 */
-	} link_id_info;
-	union {
-		struct {
-			uint8_t bss_param_change_count;
-		} info; /* bss_param_change_cnt_present = 1 */
-	} bss_param_change_cnt;
-	union {
-		struct {
-			uint16_t        medium_sync_duration:8;
-			uint16_t  medium_sync_ofdm_ed_thresh:4;
-			uint16_t    medium_sync_max_txop_num:4;
-		} info; /* medium_sync_delay_info_present = 1 */
-	} medium_sync_delay_info;
-	union {
-		struct {
-			uint16_t           emlsr_support:1;
-			uint16_t     emlsr_padding_delay:3;
-			uint16_t  emlsr_transition_delay:3;
-			uint16_t           emlmr_support:1;
-			uint16_t             emlmr_delay:3;
-			uint16_t      transition_timeout:4;
-			uint16_t                reserved:1;
-			uint8_t  emlmr_rx_nss:4;
-			uint8_t  emlmr_tx_nss:4;
-		} info; /* eml_capab_present = 1 */
-	} eml_capabilities;
-	union {
-		struct {
-			uint16_t  max_simultaneous_link_num:4;
-			uint16_t                srs_support:1;
-			uint16_t     tid_link_map_supported:2;
-			uint16_t        str_freq_separation:5;
-			uint16_t                aar_support:1;
-			uint16_t                   reserved:3;
-		} info; /* mld_capab_present = 1 */
-	} mld_capabilities;
-	uint16_t                    num_sta_profile;
-	tDot11fIEsta_profile        sta_profile[2];
+	uint8_t             present;
+	uint8_t             num_data;
+	uint8_t             data[255];
 } tDot11fIEmlo_ie;
 
 #define DOT11F_EID_MLO_IE (255)
@@ -9978,7 +9887,7 @@ typedef struct sDot11fIEmlo_ie {
 /* N.B. These #defines do *not* include the EID & length */
 #define DOT11F_IE_MLO_IE_MIN_LEN (9)
 
-#define DOT11F_IE_MLO_IE_MAX_LEN (275)
+#define DOT11F_IE_MLO_IE_MAX_LEN (255)
 
 #ifdef __cplusplus
 extern "C" {

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


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