qcacld-3.0: Update ML IE definitions as per draft 1.4

Update multi link IE definition as per 11be draft 1.4 specification.

Change-Id: I0d70649e927d5eff152b44cf47cd6833c964bde4
CRs-Fixed: 3115953

core/hdd/src/wlan_hdd_eht.c

@@ -64,22 +64,24 @@ void wlan_hdd_get_mlo_link_id(struct hdd_beacon_data *beacon,
 	if (ie) {
 		hdd_debug("find a mlo ie in beacon data");
 		*num_link = 1;
-		ie++; //WLAN_MAC_EID_EXT
-		len = *ie++; //length
-		ie++; //MLO_IE_OUI_TYPE
+		ie++; /* WLAN_MAC_EID_EXT */
+		len = *ie++; /* length */
+		ie++; /* MLO_IE_OUI_TYPE */
 		len--;
-		ie++; //Multi-Link Control field 2octets
+		ie++; /* Multi-Link Control field 2octets */
 		ie++;
 		len--;
 		len--;
-		ie += QDF_MAC_ADDR_SIZE; //mld mac addr
+		ie++; /* Common Info Length */
+		len--;
+		ie += QDF_MAC_ADDR_SIZE; /* mld mac addr */
 		len -= QDF_MAC_ADDR_SIZE;
-		*link_id = *ie++; //link id
+		*link_id = *ie++; /* link id */
 		len--;
 		while (len > 0) {
-			ie++; //sub element ID
+			ie++; /* sub element ID */
 			len--;
-			link_len = *ie++; //length of sub element ID
+			link_len = *ie++; /* length of sub element ID */
 			len--;
 			ie += link_len;
 			len -= link_len;

core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -3805,21 +3805,15 @@ IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x6B)
     {
         type: 3;
         reserved: 1;
-        mld_mac_addr_present: 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: 6;
+        reserved_1: 7;
     }
-    OPTIONAL UNION mld_mac_addr (DISCRIMINATOR mld_mac_addr_present)
-    {
-        info (mld_mac_addr_present IS 1)
-        {
-            mld_mac_addr[6];
-        }
-    };
+    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)
@@ -3854,11 +3848,12 @@ IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x6B)
         {
             {
                 emlsr_support: 1;
-                emlsr_delay: 3;
+                emlsr_padding_delay: 3;
+                emlsr_transition_delay: 3;
                 emlmr_support: 1;
                 emlmr_delay: 3;
                 transition_timeout: 4;
-                reserved: 4;
+                reserved: 1;
             }
             {
                 emlmr_rx_nss: 4;
@@ -3875,7 +3870,8 @@ IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x6B)
                 srs_support: 1;
                 tid_link_map_supported: 2;
                 str_freq_separation: 5;
-                reserved: 4;
+                aar_support: 1;
+                reserved: 3;
             }
         }
     };

core/mac/src/include/dot11f.h

@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Mon Mar 28 16:36:01 2022 from the following file(s):
+ * Fri Apr  1 15:39:36 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -9916,18 +9916,14 @@ typedef struct sDot11fIEmlo_ie {
 	uint8_t                     present;
 	uint16_t                         type:3;
 	uint16_t                     reserved:1;
-	uint16_t         mld_mac_addr_present: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:6;
-	union {
-		struct {
-			uint8_t mld_mac_addr[6];
-		} info; /* mld_mac_addr_present = 1 */
-	} mld_mac_addr;
+	uint16_t                   reserved_1:7;
+	uint8_t                     common_info_length;
+	uint8_t                     mld_mac_addr[6];
 	union {
 		struct {
 			uint8_t   link_id:4;
@@ -9948,12 +9944,13 @@ typedef struct sDot11fIEmlo_ie {
 	} medium_sync_delay_info;
 	union {
 		struct {
-			uint16_t       emlsr_support:1;
-			uint16_t         emlsr_delay:3;
-			uint16_t       emlmr_support:1;
-			uint16_t         emlmr_delay:3;
-			uint16_t  transition_timeout:4;
-			uint16_t            reserved:4;
+			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 */
@@ -9964,7 +9961,8 @@ typedef struct sDot11fIEmlo_ie {
 			uint16_t                srs_support:1;
 			uint16_t     tid_link_map_supported:2;
 			uint16_t        str_freq_separation:5;
-			uint16_t                   reserved:4;
+			uint16_t                aar_support:1;
+			uint16_t                   reserved:3;
 		} info; /* mld_capab_present = 1 */
 	} mld_capabilities;
 	uint16_t                    num_sta_profile;
@@ -9974,9 +9972,9 @@ typedef struct sDot11fIEmlo_ie {
 #define DOT11F_EID_MLO_IE (255)
 
 /* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_MLO_IE_MIN_LEN (2)
+#define DOT11F_IE_MLO_IE_MIN_LEN (9)
 
-#define DOT11F_IE_MLO_IE_MAX_LEN (274)
+#define DOT11F_IE_MLO_IE_MAX_LEN (275)
 
 #ifdef __cplusplus
 extern "C" {

core/mac/src/pe/include/lim_session.h

@@ -189,6 +189,46 @@ struct mlo_link_ie_info {
 	bool bcn_tmpl_exist;
 	struct mlo_link_ie link_ie;
 };
+
+/**
+ * struct wlan_mlo_ie_info - struct for mlo IE information
+ * @mld_mac_addr: MLD MAC address
+ * @common_info_length: Common Info Length
+ * @reserved_1: reserved bits
+ * @mld_capab_present: MLD capability present
+ * @eml_capab_present: EML capability present
+ * @medium_sync_delay_info_present: Medium sync delay information present
+ * @bss_param_change_cnt_present: BSS parameter change count present
+ * @link_id_info_present: Link ID information present
+ * @reserved: reserved bit
+ * @type: Type bits
+ */
+struct wlan_mlo_ie_info {
+#ifndef ANI_LITTLE_BIT_ENDIAN
+	uint8_t mld_mac_addr[6];
+	uint8_t common_info_length;
+	uint16_t reserved_1:7;
+	uint16_t mld_capab_present:1;
+	uint16_t eml_capab_present:1;
+	uint16_t medium_sync_delay_info_present:1;
+	uint16_t bss_param_change_cnt_present:1;
+	uint16_t link_id_info_present:1;
+	uint16_t reserved:1;
+	uint16_t type:3;
+#else
+	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];
+#endif
+} qdf_packed;
+
 #endif
 
 /**

core/mac/src/pe/lim/lim_utils.c

@@ -8013,8 +8013,6 @@ void lim_set_mlo_caps(struct mac_context *mac, struct pe_session *session,
 
 		mlo_ie_info->type = dot11_cap.type;
 		mlo_ie_info->reserved = dot11_cap.reserved;
-		mlo_ie_info->mld_mac_addr_present =
-				dot11_cap.mld_mac_addr_present;
 		mlo_ie_info->link_id_info_present =
 				dot11_cap.link_id_info_present;
 		mlo_ie_info->bss_param_change_cnt_present =
@@ -8024,8 +8022,9 @@ void lim_set_mlo_caps(struct mac_context *mac, struct pe_session *session,
 		mlo_ie_info->eml_capab_present = dot11_cap.eml_capab_present;
 		mlo_ie_info->mld_capab_present = dot11_cap.mld_capab_present;
 		mlo_ie_info->reserved_1 = dot11_cap.reserved_1;
-		qdf_mem_copy(&mlo_ie_info->mld_mac_addr.info.mld_mac_addr,
-			     &dot11_cap.mld_mac_addr.info.mld_mac_addr,
+		mlo_ie_info->common_info_length = dot11_cap.common_info_length;
+		qdf_mem_copy(&mlo_ie_info->mld_mac_addr,
+			     &dot11_cap.mld_mac_addr,
 			     QDF_MAC_ADDR_SIZE);
 		ie_start[1] += QDF_MAC_ADDR_SIZE;
 	}

core/mac/src/sys/legacy/src/utils/src/dot11f.c

@@ -25,7 +25,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Mon Mar 28 16:36:01 2022 from the following file(s):
+ * Fri Apr  1 15:39:36 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -9820,25 +9820,28 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx,
 	ielen -= 2;
 	pDst->type = tmp101__ >> 0 & 0x7;
 	pDst->reserved = tmp101__ >> 3 & 0x1;
-	pDst->mld_mac_addr_present = tmp101__ >> 4 & 0x1;
-	pDst->link_id_info_present = tmp101__ >> 5 & 0x1;
-	pDst->bss_param_change_cnt_present = tmp101__ >> 6 & 0x1;
-	pDst->medium_sync_delay_info_present = tmp101__ >> 7 & 0x1;
-	pDst->eml_capab_present = tmp101__ >> 8 & 0x1;
-	pDst->mld_capab_present = tmp101__ >> 9 & 0x1;
-	pDst->reserved_1 = tmp101__ >> 10 & 0x3f;
-	switch (pDst->mld_mac_addr_present) {
-	case 1:
-		if (unlikely(ielen < 6)) {
-			pDst->present = 0;
-			return DOT11F_INCOMPLETE_IE;
-		}
+	pDst->link_id_info_present = tmp101__ >> 4 & 0x1;
+	pDst->bss_param_change_cnt_present = tmp101__ >> 5 & 0x1;
+	pDst->medium_sync_delay_info_present = tmp101__ >> 6 & 0x1;
+	pDst->eml_capab_present = tmp101__ >> 7 & 0x1;
+	pDst->mld_capab_present = tmp101__ >> 8 & 0x1;
+	pDst->reserved_1 = tmp101__ >> 9 & 0x7f;
+	if (unlikely(ielen < 1)) {
+		pDst->present = 0;
+		return DOT11F_INCOMPLETE_IE;
+	}
 
-		DOT11F_MEMCPY(pCtx, pDst->mld_mac_addr.info.mld_mac_addr, pBuf, 6);
-		pBuf += 6;
-		ielen -= (uint8_t)6;
-		break;
+	pDst->common_info_length = *pBuf;
+	pBuf += 1;
+	ielen -= (uint8_t)1;
+	if (unlikely(ielen < 6)) {
+		pDst->present = 0;
+		return DOT11F_INCOMPLETE_IE;
 	}
+
+	DOT11F_MEMCPY(pCtx, pDst->mld_mac_addr, pBuf, 6);
+	pBuf += 6;
+	ielen -= (uint8_t)6;
 	switch (pDst->link_id_info_present) {
 	case 1:
 		if (unlikely(ielen < 1)) {
@@ -9891,11 +9894,12 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx,
 		pBuf += 2;
 		ielen -= 2;
 		pDst->eml_capabilities.info.emlsr_support = tmp104__ >> 0 & 0x1;
-		pDst->eml_capabilities.info.emlsr_delay = tmp104__ >> 1 & 0x7;
-		pDst->eml_capabilities.info.emlmr_support = tmp104__ >> 4 & 0x1;
-		pDst->eml_capabilities.info.emlmr_delay = tmp104__ >> 5 & 0x7;
-		pDst->eml_capabilities.info.transition_timeout = tmp104__ >> 8 & 0xf;
-		pDst->eml_capabilities.info.reserved = tmp104__ >> 12 & 0xf;
+		pDst->eml_capabilities.info.emlsr_padding_delay = tmp104__ >> 1 & 0x7;
+		pDst->eml_capabilities.info.emlsr_transition_delay = tmp104__ >> 4 & 0x7;
+		pDst->eml_capabilities.info.emlmr_support = tmp104__ >> 7 & 0x1;
+		pDst->eml_capabilities.info.emlmr_delay = tmp104__ >> 8 & 0x7;
+		pDst->eml_capabilities.info.transition_timeout = tmp104__ >> 11 & 0xf;
+		pDst->eml_capabilities.info.reserved = tmp104__ >> 15 & 0x1;
 		if (unlikely(ielen < 1)) {
 			pDst->present = 0;
 			return DOT11F_INCOMPLETE_IE;
@@ -9922,7 +9926,8 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx,
 		pDst->mld_capabilities.info.srs_support = tmp106__ >> 4 & 0x1;
 		pDst->mld_capabilities.info.tid_link_map_supported = tmp106__ >> 5 & 0x3;
 		pDst->mld_capabilities.info.str_freq_separation = tmp106__ >> 7 & 0x1f;
-		pDst->mld_capabilities.info.reserved = tmp106__ >> 12 & 0xf;
+		pDst->mld_capabilities.info.aar_support = tmp106__ >> 12 & 0x1;
+		pDst->mld_capabilities.info.reserved = tmp106__ >> 13 & 0x7;
 		break;
 	}
 	(void)pCtx;
@@ -10962,7 +10967,7 @@ static const tIEDefn IES_AssocRequest[] = {
 	present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fAssocRequest, WPAOpaque), offsetof(tDot11fIEWPAOpaque,
 	present), 0, "WPAOpaque", 0, 8, 255, SigIeWPAOpaque, {0, 80, 242, 1, 0},
@@ -11156,7 +11161,7 @@ static const tIEDefn IES_AssocResponse[] = {
 	present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fAssocResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fAssocResponse, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
@@ -11269,7 +11274,7 @@ static const tIEDefn IES_Authentication[] = {
 	"fils_assoc_delay_info", 0, 3, 3, SigIefils_assoc_delay_info,
 	{0, 0, 0, 0, 0}, 0, DOT11F_EID_FILS_ASSOC_DELAY_INFO, 1, 0, },
 	{ offsetof(tDot11fAuthentication, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
 
@@ -11463,7 +11468,7 @@ static const tIEDefn IES_Beacon[] = {
 	"eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeacon, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0,
-	"mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	"mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeacon, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA",
 	0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
@@ -11715,7 +11720,7 @@ static const tIEDefn IES_Beacon2[] = {
 	"eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeacon2, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0,
-	"mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	"mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeacon2, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA",
 	0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
@@ -11958,7 +11963,7 @@ static const tIEDefn IES_BeaconIEs[] = {
 	0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeaconIEs, mlo_ie), offsetof(tDot11fIEmlo_ie, present),
-	0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeaconIEs, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
@@ -12432,7 +12437,7 @@ static const tIEDefn IES_ProbeRequest[] = {
 	present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fProbeRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fProbeRequest, WscProbeReq),
 	offsetof(tDot11fIEWscProbeReq, present), 0, "WscProbeReq",
@@ -12634,7 +12639,7 @@ static const tIEDefn IES_ProbeResponse[] = {
 	present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fProbeResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fProbeResponse, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
@@ -12912,7 +12917,7 @@ static const tIEDefn IES_ReAssocRequest[] = {
 	present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fReAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fReAssocRequest, WPAOpaque),
 	offsetof(tDot11fIEWPAOpaque, present), 0, "WPAOpaque",
@@ -13088,7 +13093,7 @@ static const tIEDefn IES_ReAssocResponse[] = {
 	present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fReAssocResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
-	present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0},
+	present), 0, "mlo_ie", 0, 11, 277, SigIemlo_ie, {0, 0, 0, 0, 0},
 	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fReAssocResponse, WPA), offsetof(tDot11fIEWPA, present),
 	0, "WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0},
@@ -17716,13 +17721,8 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 	(void)pCtx;
 	while (pIe->present) {
 		*pnNeeded += 2;
-		if (pIe->mld_mac_addr_present) {
-			switch (pIe->mld_mac_addr_present) {
-			case 1:
-				*pnNeeded += 6;
-				break;
-			}
-		}
+		*pnNeeded += 1;
+		*pnNeeded += 6;
 		if (pIe->link_id_info_present) {
 			switch (pIe->link_id_info_present) {
 			case 1:
@@ -29542,13 +29542,12 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 		tmp220__ = 0U;
 		tmp220__ |= (pSrc->type << 0);
 		tmp220__ |= (pSrc->reserved << 3);
-		tmp220__ |= (pSrc->mld_mac_addr_present << 4);
-		tmp220__ |= (pSrc->link_id_info_present << 5);
-		tmp220__ |= (pSrc->bss_param_change_cnt_present << 6);
-		tmp220__ |= (pSrc->medium_sync_delay_info_present << 7);
-		tmp220__ |= (pSrc->eml_capab_present << 8);
-		tmp220__ |= (pSrc->mld_capab_present << 9);
-		tmp220__ |= (pSrc->reserved_1 << 10);
+		tmp220__ |= (pSrc->link_id_info_present << 4);
+		tmp220__ |= (pSrc->bss_param_change_cnt_present << 5);
+		tmp220__ |= (pSrc->medium_sync_delay_info_present << 6);
+		tmp220__ |= (pSrc->eml_capab_present << 7);
+		tmp220__ |= (pSrc->mld_capab_present << 8);
+		tmp220__ |= (pSrc->reserved_1 << 9);
 		if (unlikely(nBuf < 2))
 			return DOT11F_INCOMPLETE_IE;
 
@@ -29556,15 +29555,12 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 		*pnConsumed += 2;
 		pBuf += 2;
 		nBuf -=  2 ;
-		if (pSrc->mld_mac_addr_present) {
-			switch (pSrc->mld_mac_addr_present) {
-			case 1:
-				DOT11F_MEMCPY(pCtx, pBuf, pSrc->mld_mac_addr.info.mld_mac_addr, 6);
-				*pnConsumed += 6;
-				pBuf += 6;
-				break;
-			}
-		}
+		*pBuf = pSrc->common_info_length;
+		*pnConsumed += 1;
+		pBuf += 1;
+		DOT11F_MEMCPY(pCtx, pBuf, pSrc->mld_mac_addr, 6);
+		*pnConsumed += 6;
+		pBuf += 6;
 		if (pSrc->link_id_info_present) {
 			switch (pSrc->link_id_info_present) {
 			case 1:
@@ -29612,11 +29608,12 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 			case 1:
 				tmp223__ = 0U;
 				tmp223__ |= (pSrc->eml_capabilities.info.emlsr_support << 0);
-				tmp223__ |= (pSrc->eml_capabilities.info.emlsr_delay << 1);
-				tmp223__ |= (pSrc->eml_capabilities.info.emlmr_support << 4);
-				tmp223__ |= (pSrc->eml_capabilities.info.emlmr_delay << 5);
-				tmp223__ |= (pSrc->eml_capabilities.info.transition_timeout << 8);
-				tmp223__ |= (pSrc->eml_capabilities.info.reserved << 12);
+				tmp223__ |= (pSrc->eml_capabilities.info.emlsr_padding_delay << 1);
+				tmp223__ |= (pSrc->eml_capabilities.info.emlsr_transition_delay << 4);
+				tmp223__ |= (pSrc->eml_capabilities.info.emlmr_support << 7);
+				tmp223__ |= (pSrc->eml_capabilities.info.emlmr_delay << 8);
+				tmp223__ |= (pSrc->eml_capabilities.info.transition_timeout << 11);
+				tmp223__ |= (pSrc->eml_capabilities.info.reserved << 15);
 				if (unlikely(nBuf < 2))
 					return DOT11F_INCOMPLETE_IE;
 
@@ -29645,7 +29642,8 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				tmp225__ |= (pSrc->mld_capabilities.info.srs_support << 4);
 				tmp225__ |= (pSrc->mld_capabilities.info.tid_link_map_supported << 5);
 				tmp225__ |= (pSrc->mld_capabilities.info.str_freq_separation << 7);
-				tmp225__ |= (pSrc->mld_capabilities.info.reserved << 12);
+				tmp225__ |= (pSrc->mld_capabilities.info.aar_support << 12);
+				tmp225__ |= (pSrc->mld_capabilities.info.reserved << 13);
 				if (unlikely(nBuf < 2))
 					return DOT11F_INCOMPLETE_IE;
 

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -3282,12 +3282,12 @@ sir_convert_assoc_req_frame2_struct(struct mac_context *mac,
 		pAssocReq->mlo_info.num_partner_links =
 					ar->mlo_ie.num_sta_profile;
 		qdf_mem_copy(pAssocReq->mld_mac,
-			     ar->mlo_ie.mld_mac_addr.info.mld_mac_addr,
+			     ar->mlo_ie.mld_mac_addr,
 			     QDF_MAC_ADDR_SIZE);
 		pe_debug("Partner link count: %d, MLD mac addr: " QDF_MAC_ADDR_FMT,
 			 ar->mlo_ie.num_sta_profile,
 			 QDF_MAC_ADDR_REF(
-				ar->mlo_ie.mld_mac_addr.info.mld_mac_addr));
+				ar->mlo_ie.mld_mac_addr));
 	}
 	pe_debug("ht %d vht %d opmode %d vendor vht %d he %d he 6ghband %d eht %d",
 		 ar->HTCaps.present, ar->VHTCaps.present,
@@ -3788,12 +3788,11 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 		dot11f_parse_assoc_rsp_mlo_partner_info(session_entry,
 							frame, frame_len);
 		pAssocRsp->mlo_ie.mlo_ie.present = ar->mlo_ie.present;
-		pAssocRsp->mlo_ie.mlo_ie.mld_mac_addr_present =
-					ar->mlo_ie.mld_mac_addr_present;
 		qdf_mem_copy(
-		&pAssocRsp->mlo_ie.mlo_ie.mld_mac_addr.info.mld_mac_addr,
-		&ar->mlo_ie.mld_mac_addr.info.mld_mac_addr, QDF_MAC_ADDR_SIZE);
-
+		&pAssocRsp->mlo_ie.mlo_ie.mld_mac_addr,
+		&ar->mlo_ie.mld_mac_addr, QDF_MAC_ADDR_SIZE);
+		pAssocRsp->mlo_ie.mlo_ie.common_info_length =
+					ar->mlo_ie.common_info_length;
 		pAssocRsp->mlo_ie.mlo_ie.link_id_info_present =
 					ar->mlo_ie.link_id_info_present;
 		pAssocRsp->mlo_ie.mlo_ie.link_id_info.info.link_id =
@@ -3804,7 +3803,7 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 			 ar->mlo_ie.num_sta_profile,
 			 ar->mlo_ie.link_id_info.info.link_id,
 			 QDF_MAC_ADDR_REF(
-				ar->mlo_ie.mld_mac_addr.info.mld_mac_addr));
+				ar->mlo_ie.mld_mac_addr));
 	}
 	pe_debug("ht %d vht %d vendor vht: cap %d op %d, he %d he 6ghband %d eht %d eht320 %d, max idle: present %d val %d, he mu edca %d wmm %d qos %d",
 		 ar->HTCaps.present, ar->VHTCaps.present,
@@ -4027,7 +4026,7 @@ sir_convert_reassoc_req_frame2_struct(struct mac_context *mac,
 		pAssocReq->mlo_info.num_partner_links =
 					ar->mlo_ie.num_sta_profile;
 		qdf_mem_copy(pAssocReq->mld_mac,
-			     ar->mlo_ie.mld_mac_addr.info.mld_mac_addr,
+			     ar->mlo_ie.mld_mac_addr,
 			     QDF_MAC_ADDR_SIZE);
 	}
 
@@ -8270,20 +8269,32 @@ QDF_STATUS populate_dot11f_assoc_rsp_mlo_ie(struct mac_context *mac_ctx,
 	tDot11fFfStatus sta_status;
 	tDot11fIEP2PAssocRes sta_p2p_assoc_res;
 	tDot11fIEnon_inheritance sta_non_inheritance;
+	uint8_t common_info_len = 0, len = 0;
 
 	mlo_ie->present = 1;
-	mlo_ie->mld_mac_addr_present = 1;
 	mlo_ie->type = 0;
-	qdf_mem_copy(mlo_ie->mld_mac_addr.info.mld_mac_addr,
+
+	/* Common Info Length*/
+	common_info_len += WLAN_ML_BV_CINFO_LENGTH_SIZE;
+	qdf_mem_copy(mlo_ie->mld_mac_addr,
 		     session->vdev->mlo_dev_ctx->mld_addr.bytes,
-		     sizeof(mlo_ie->mld_mac_addr.info.mld_mac_addr));
+		     sizeof(mlo_ie->mld_mac_addr));
+	common_info_len += QDF_MAC_ADDR_SIZE;
+
 	mlo_ie->link_id_info_present = 1;
 	mlo_ie->link_id_info.info.link_id = wlan_vdev_get_link_id(
 							session->vdev);
+	common_info_len += WLAN_ML_BV_CINFO_LINKIDINFO_SIZE;
+
 	mlo_ie->bss_param_change_cnt_present = 1;
 	mlo_ie->bss_param_change_cnt.info.bss_param_change_count =
 		session->mlo_link_info.link_ie.bss_param_change_cnt;
+	common_info_len += WLAN_ML_BV_CINFO_BSSPARAMCHNGCNT_SIZE;
+
 	mlo_ie->mld_capab_present = 1;
+	common_info_len += WLAN_ML_BV_CINFO_MLDCAP_SIZE;
+
+	mlo_ie->common_info_length = common_info_len;
 
 	assoc_req = session->parsedAssocReq[sta->assocId];
 	for (link = 0; link < assoc_req->mlo_info.num_partner_links; link++) {
@@ -8340,6 +8351,20 @@ QDF_STATUS populate_dot11f_assoc_rsp_mlo_ie(struct mac_context *mac_ctx,
 		/* sta control */
 		sta_data += 2;
 		sta_len_left -= 2;
+
+		/*
+		 * 1 Bytes for STA Info Length + 6 bytes for STA MAC Address +
+		 * 2 Bytes for Becon Interval + 2 Bytes for DTIM Info
+		 */
+		len = WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE +
+		      QDF_MAC_ADDR_SIZE + WLAN_BEACONINTERVAL_LEN +
+		      sizeof(struct wlan_ml_bv_linfo_perstaprof_stainfo_dtiminfo);
+		*sta_data = len;
+
+		/* STA Info Length */
+		sta_data += WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE;
+		sta_len_left -= WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE;
+
 		/*mac addr*/
 		qdf_mem_copy(sta_data, link_session->self_mac_addr,
 			     QDF_MAC_ADDR_SIZE);
@@ -8804,36 +8829,45 @@ QDF_STATUS populate_dot11f_bcn_mlo_ie(struct mac_context *mac_ctx,
 	uint8_t *sta_data;
 	uint32_t sta_len_left;
 	uint32_t sta_len_consumed;
+	uint8_t common_info_length = 0;
 
+	/* Common Info Length */
+	common_info_length += WLAN_ML_BV_CINFO_LENGTH_SIZE;
 	qdf_mem_zero(&mac_ctx->sch.sch_mlo_partner,
 		     sizeof(mac_ctx->sch.sch_mlo_partner));
 	sch_info = &mac_ctx->sch.sch_mlo_partner;
 	mlo_ie->present = 1;
-	mlo_ie->mld_mac_addr_present = 1;
 	mlo_ie->type = 0;
 	tmp_offset += 1; /* Element ID */
 	tmp_offset += 1; /* length */
 	tmp_offset += 1; /* Element ID extension */
 	tmp_offset += 2; /* Multi-link control */
-	qdf_mem_copy(mlo_ie->mld_mac_addr.info.mld_mac_addr,
+	qdf_mem_copy(mlo_ie->mld_mac_addr,
 		     session->vdev->mlo_dev_ctx->mld_addr.bytes,
-		     sizeof(mlo_ie->mld_mac_addr.info.mld_mac_addr));
+		     sizeof(mlo_ie->mld_mac_addr));
+	tmp_offset += 1; /* Common Info Length */
 	tmp_offset += 6; /* mld mac addr */
+	common_info_length += QDF_MAC_ADDR_SIZE;
 	mlo_ie->link_id_info_present = 1;
 	mlo_ie->link_id_info.info.link_id = wlan_vdev_get_link_id(
 						session->vdev);
 	tmp_offset += 1; /* link id */
+	common_info_length += WLAN_ML_BV_CINFO_LINKIDINFO_SIZE;
 	mlo_ie->bss_param_change_cnt_present = 1;
 	mlo_ie->bss_param_change_cnt.info.bss_param_change_count =
 		session->mlo_link_info.link_ie.bss_param_change_cnt;
 	tmp_offset += 1; /* bss parameters change count */
+	common_info_length += WLAN_ML_BV_CINFO_BSSPARAMCHNGCNT_SIZE;
 	mlo_ie->mld_capab_present = 1;
 	tmp_offset += 2; /* mld capabilities */
+	common_info_length += WLAN_ML_BV_CINFO_MLDCAP_SIZE;
 	sch_info->num_links = 0;
 
 	lim_get_mlo_vdev_list(session, &vdev_count, wlan_vdev_list);
 	mlo_ie->mld_capabilities.info.max_simultaneous_link_num =
 							vdev_count - 1;
+
+	mlo_ie->common_info_length = common_info_length;
 	sch_info->mlo_ie_link_info_ofst = tmp_offset;
 	for (link = 0; link < vdev_count; link++) {
 		if (!wlan_vdev_list[link])
@@ -9021,10 +9055,9 @@ populate_dot11f_probe_req_mlo_ie(struct mac_context *mac_ctx,
 
 	mlo_ie->present = 1;
 	mlo_ie->type = 1;
-	mlo_ie->mld_mac_addr_present = 1;
 	mld_addr = wlan_vdev_mlme_get_mldaddr(session->vdev);
-	qdf_mem_copy(&mlo_ie->mld_mac_addr.info.mld_mac_addr, mld_addr,
-		     sizeof(mlo_ie->mld_mac_addr.info.mld_mac_addr));
+	qdf_mem_copy(&mlo_ie->mld_mac_addr, mld_addr,
+		     sizeof(mlo_ie->mld_mac_addr));
 	mlo_ie->link_id_info_present = 0;
 
 	return QDF_STATUS_SUCCESS;
@@ -9036,21 +9069,26 @@ populate_dot11f_mlo_caps(struct mac_context *mac_ctx,
 			 tDot11fIEmlo_ie *mlo_ie)
 {
 	uint8_t *mld_addr;
+	uint8_t common_info_len = 0;
 
 	mlo_ie->present = 1;
 	mlo_ie->type = 0;
-	mlo_ie->mld_mac_addr_present = 1;
+	/* Common Info Length */
+	common_info_len += WLAN_ML_BV_CINFO_LENGTH_SIZE;
 	mld_addr = wlan_vdev_mlme_get_mldaddr(session->vdev);
-	qdf_mem_copy(&mlo_ie->mld_mac_addr.info.mld_mac_addr, mld_addr,
-		     sizeof(mlo_ie->mld_mac_addr.info.mld_mac_addr));
+	qdf_mem_copy(&mlo_ie->mld_mac_addr, mld_addr,
+		     sizeof(mlo_ie->mld_mac_addr));
+	common_info_len += QDF_MAC_ADDR_SIZE;
 	mlo_ie->link_id_info_present = 0;
 
 	mlo_ie->bss_param_change_cnt_present = 0;
 	mlo_ie->medium_sync_delay_info_present = 0;
 	mlo_ie->eml_capab_present = 0;
 	mlo_ie->mld_capab_present = 1;
+	common_info_len += WLAN_ML_BV_CINFO_MLDCAP_SIZE;
 	mlo_ie->reserved = 0;
 	mlo_ie->reserved_1 = 0;
+	mlo_ie->common_info_length = common_info_len;
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -9068,10 +9106,10 @@ sir_convert_mlo_probe_rsp_frame2_struct(tDot11fProbeResponse *pr,
 	qdf_mem_zero((uint8_t *)mlo_ie_ptr, sizeof(tSirMultiLink_IE));
 
 	mlo_ie_ptr->mlo_ie.present = pr->mlo_ie.present;
-	mlo_ie_ptr->mlo_ie.mld_mac_addr_present =
-			pr->mlo_ie.mld_mac_addr_present;
-	qdf_mem_copy(&mlo_ie_ptr->mlo_ie.mld_mac_addr.info.mld_mac_addr,
-		     &pr->mlo_ie.mld_mac_addr.info.mld_mac_addr,
+	mlo_ie_ptr->mlo_ie.common_info_length =
+				pr->mlo_ie.common_info_length;
+	qdf_mem_copy(&mlo_ie_ptr->mlo_ie.mld_mac_addr,
+		     &pr->mlo_ie.mld_mac_addr,
 		     QDF_MAC_ADDR_SIZE);
 
 	mlo_ie_ptr->mlo_ie.link_id_info_present =
@@ -9976,11 +10014,13 @@ QDF_STATUS populate_dot11f_auth_mlo_ie(struct mac_context *mac_ctx,
 	pe_debug("Populate Auth MLO IEs");
 
 	mlo_ie->present = 1;
-	mlo_ie->mld_mac_addr_present = 1;
 	mlo_ie->type = 0;
 
-	mld_addr = (struct qdf_mac_addr *)wlan_vdev_mlme_get_mldaddr(pe_session->vdev);
+	mlo_ie->common_info_length = WLAN_ML_BV_CINFO_LENGTH_SIZE;
+	mld_addr = (struct qdf_mac_addr *)wlan_vdev_mlme_get_mldaddr(
+							pe_session->vdev);
 	qdf_mem_copy(&mlo_ie->mld_mac_addr, mld_addr, QDF_MAC_ADDR_SIZE);
+	mlo_ie->common_info_length += QDF_MAC_ADDR_SIZE;
 
 	pe_debug("MLD mac addr: " QDF_MAC_ADDR_FMT, mld_addr);
 
@@ -10017,7 +10057,7 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	uint8_t op_class;
 	uint8_t *p_sta_prof;
 	uint32_t len_consumed;
-	uint8_t len_remaining;
+	uint8_t len_remaining, len;
 	tDot11fIEnon_inheritance sta_prof_non_inherit;
 	tDot11fFfCapabilities mlo_cap;
 	tDot11fIEHTCaps ht_caps;
@@ -10037,18 +10077,19 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 	mlo_ie = &frm->mlo_ie;
 
 	mlo_ie->present = 1;
-	mlo_ie->mld_mac_addr_present = 1;
 	mlo_ie->type = 0;
+	mlo_ie->common_info_length = WLAN_ML_BV_CINFO_LENGTH_SIZE;
 	mld_addr = (struct qdf_mac_addr *)wlan_vdev_mlme_get_mldaddr(pe_session->vdev);
-	qdf_mem_copy(&mlo_ie->mld_mac_addr.info.mld_mac_addr,
+	qdf_mem_copy(&mlo_ie->mld_mac_addr,
 		     mld_addr,
 		     QDF_MAC_ADDR_SIZE);
+	mlo_ie->common_info_length += QDF_MAC_ADDR_SIZE;
 	mlo_ie->link_id_info_present = 0;
 
 	mlo_ie->bss_param_change_cnt_present = 0;
 	mlo_ie->medium_sync_delay_info_present = 0;
 	mlo_ie->eml_capab_present = 0;
-	mlo_ie->mld_capab_present = 0;
+	mlo_ie->mld_capab_present = 1;
 
 	/* find out number of links from bcn or prb rsp */
 	total_sta_prof = 1;
@@ -10104,6 +10145,17 @@ QDF_STATUS populate_dot11f_assoc_req_mlo_ie(struct mac_context *mac_ctx,
 		/* 2 Bytes for sta control field*/
 		p_sta_prof += 2;
 		len_remaining -= 2;
+
+		/* 1 Bytes for STA Info Length + 6 bytes for STA MAC Address*/
+		len = WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE +
+		      QDF_MAC_ADDR_SIZE;
+		*p_sta_prof = len;
+
+		/* 1 Byte for STA Info Length */
+		p_sta_prof += WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE;
+		len_remaining -=
+			WLAN_ML_BV_LINFO_PERSTAPROF_STAINFO_LENGTH_SIZE;
+
 		/* Copying sta mac address in sta info field */
 		qdf_mem_copy(p_sta_prof, vdev->vdev_mlme.macaddr,
 			     QDF_MAC_ADDR_SIZE);