qcacmn: Update the correct bit index for ML IE

Update the correct bit index for ML IE control field

Change-Id: I8b2dcf70fd2ee83ae24eeba8359798499c0b7c74

umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c

@@ -1412,7 +1412,7 @@ static int8_t cm_get_joint_rssi(struct scan_cache_entry *entry,
 	uint8_t alpha = weight_config->joint_rssi_alpha;
 
 	if (entry->channel.chan_freq <
-				entry->ml_info->link_info[link_idx].freq) {
+				entry->ml_info.link_info[link_idx].freq) {
 		low_band_rssi = entry->rssi_raw;
 		high_band_rssi = cm_get_partner_link_rssi(entry, link_idx);
 	} else {
@@ -1473,12 +1473,12 @@ static int cm_calculate_eht_score(struct scan_cache_entry *entry,
 			 joint_esp_score, joint_oce_score, wlm_indication_score,
 			 mlsr_score, emlsr_score);
 
-	entry->ml_info->ml_bss_score = eht_caps_score + mlo_score +
+	entry->ml_info.ml_bss_score = eht_caps_score + mlo_score +
 				      joint_rssi_score + joint_esp_score +
 				      joint_oce_score + wlm_indication_score +
 				      mlsr_score + emlsr_score;
 
-	return entry->ml_info->ml_bss_score;
+	return entry->ml_info.ml_bss_score;
 }
 
 static int32_t

umac/mlme/connection_mgr/core/src/wlan_cm_connect.c

@@ -447,11 +447,11 @@ void cm_set_vdev_link_id(struct cnx_mgr *cm_ctx,
 	uint8_t link_id;
 	uint8_t i;
 
-	for (i = 0; i < req->cur_candidate->entry->ml_info->num_links; i++) {
-		if (qdf_mem_cmp(req->cur_candidate->entry->ml_info->link_info[i].link_addr.bytes,
+	for (i = 0; i < req->cur_candidate->entry->ml_info.num_links; i++) {
+		if (qdf_mem_cmp(req->cur_candidate->entry->ml_info.link_info[i].link_addr.bytes,
 				req->cur_candidate->entry->mac_addr.bytes, QDF_MAC_ADDR_SIZE))
 			continue;
-		link_id = req->cur_candidate->entry->ml_info->link_info[i].link_id;
+		link_id = req->cur_candidate->entry->ml_info.link_info[i].link_id;
 		if (cm_ctx->vdev) {
 			mlme_debug("setting link ID to %d", link_id);
 			wlan_vdev_set_link_id(cm_ctx->vdev, link_id);
@@ -493,9 +493,8 @@ static void cm_update_vdev_mlme_macaddr(struct cnx_mgr *cm_ctx,
  */
 static struct qdf_mac_addr *cm_get_bss_peer_mld_addr(struct cm_connect_req *req)
 {
-	if (req && req->cur_candidate && req->cur_candidate->entry &&
-	    req->cur_candidate->entry->ml_info)
-		return &req->cur_candidate->entry->ml_info->mld_mac_addr;
+	if (req && req->cur_candidate && req->cur_candidate->entry)
+		return &req->cur_candidate->entry->ml_info.mld_mac_addr;
 	else
 		return NULL;
 }

umac/scan/dispatcher/inc/wlan_scan_public_structs.h

@@ -625,7 +625,7 @@ struct scan_cache_entry {
 	 */
 	uint8_t pdev_id;
 #ifdef WLAN_FEATURE_11BE_MLO
-	struct ml_info *ml_info;
+	struct ml_info ml_info;
 #endif
 };
 

umac/scan/dispatcher/inc/wlan_scan_utils_api.h

@@ -618,18 +618,6 @@ util_scan_entry_copy_ie_data(struct scan_cache_entry *scan_entry,
 	return QDF_STATUS_E_NOMEM;
 }
 
-#ifdef WLAN_FEATURE_11BE_MLO
-static inline void util_scan_free_ml_info(struct scan_cache_entry *scan_entry)
-{
-	if (scan_entry->ml_info)
-		qdf_mem_free(scan_entry->ml_info);
-}
-#else
-static inline void util_scan_free_ml_info(struct scan_cache_entry *scan_entry)
-{
-}
-#endif
-
 /**
  * util_scan_free_cache_entry() - function to free scan
  * cache entry
@@ -649,7 +637,6 @@ util_scan_free_cache_entry(struct scan_cache_entry *scan_entry)
 	if (scan_entry->raw_frame.ptr)
 		qdf_mem_free(scan_entry->raw_frame.ptr);
 
-	util_scan_free_ml_info(scan_entry);
 	qdf_mem_free(scan_entry);
 }
 
@@ -772,14 +759,14 @@ util_scan_get_ml_partner_info(struct scan_cache_entry *scan_entry)
 
 	partner_info.num_partner_links =
 			qdf_min((uint8_t)WLAN_UMAC_MLO_MAX_VDEVS - 1,
-				scan_entry->ml_info->num_links - 1);
+				scan_entry->ml_info.num_links - 1);
 	/* TODO: Make sure that scan_entry->ml_info->link_info is a sorted
 	 * list */
 	for (i = 0; i < partner_info.num_partner_links; i++) {
 		partner_info.partner_link_info[i].link_addr =
-				scan_entry->ml_info->link_info[i].link_addr;
+				scan_entry->ml_info.link_info[i].link_addr;
 		partner_info.partner_link_info[i].link_id =
-				scan_entry->ml_info->link_info[i].link_id;
+				scan_entry->ml_info.link_info[i].link_id;
 	}
 
 	return partner_info;

umac/scan/dispatcher/src/wlan_scan_utils_api.c

@@ -1765,12 +1765,12 @@ static uint8_t util_get_link_info_offset(uint8_t *ml_ie)
 	uint8_t ml_ie_len = ml_ie[1];
 	uint16_t multi_link_ctrl = *(uint16_t *)(ml_ie + ML_CONTROL_OFFSET);
 
-	offset += (BIT(0) & multi_link_ctrl) * 6 +
-		  (BIT(1) & multi_link_ctrl) * 1 +
-		  (BIT(2) & multi_link_ctrl) * 1 +
-		  (BIT(3) & multi_link_ctrl) * 2 +
-		  (BIT(4) & multi_link_ctrl) * 2 +
-		  (BIT(5) & multi_link_ctrl) * 2;
+	offset += (BIT(4) & multi_link_ctrl) * 6 +
+		  (BIT(5) & multi_link_ctrl) * 1 +
+		  (BIT(6) & multi_link_ctrl) * 1 +
+		  (BIT(7) & multi_link_ctrl) * 2 +
+		  (BIT(8) & multi_link_ctrl) * 2 +
+		  (BIT(9) & multi_link_ctrl) * 2;
 
 	if (offset < ml_ie_len)
 		return offset;
@@ -1785,10 +1785,10 @@ static void util_get_partner_link_info(struct scan_cache_entry *scan_entry)
 	uint16_t sta_ctrl;
 
 	/* Update partner info  from RNR IE */
-	qdf_mem_copy(&scan_entry->ml_info->link_info[0].link_addr,
+	qdf_mem_copy(&scan_entry->ml_info.link_info[0].link_addr,
 		     &scan_entry->rnr.bss_info[0].bssid, 6);
 
-	scan_entry->ml_info->link_info[0].link_id =
+	scan_entry->ml_info.link_info[0].link_id =
 				scan_entry->rnr.bss_info[0].mld_info.link_id;
 
 	if (!offset)
@@ -1804,10 +1804,10 @@ static void util_get_partner_link_info(struct scan_cache_entry *scan_entry)
 		/* Skip STA control field */
 		offset += 2;
 
-		scan_entry->ml_info->link_info[0].link_id = sta_ctrl & 0xF;
+		scan_entry->ml_info.link_info[0].link_id = sta_ctrl & 0xF;
 		if (sta_ctrl & LINK_INFO_MAC_ADDR_PRESENT_BIT) {
 			qdf_mem_copy(
-				&scan_entry->ml_info->link_info[0].link_addr,
+				&scan_entry->ml_info.link_info[0].link_addr,
 				ml_ie + offset, 6);
 			scm_debug("Found partner info in ML IE");
 			return;
@@ -1818,33 +1818,33 @@ static void util_get_partner_link_info(struct scan_cache_entry *scan_entry)
 static void util_scan_update_ml_info(struct scan_cache_entry *scan_entry)
 {
 	uint8_t *ml_ie = scan_entry->ie_list.multi_link;
-	uint16_t multi_link_ctrl = *(uint16_t *)(ml_ie + ML_CONTROL_OFFSET);
+	uint16_t multi_link_ctrl;
 	uint8_t offset;
 
 	if (!scan_entry->ie_list.multi_link)
 		return;
 
-	scan_entry->ml_info = qdf_mem_malloc_atomic(
-					sizeof(*scan_entry->ml_info));
+	multi_link_ctrl = *(uint16_t *)(ml_ie + ML_CONTROL_OFFSET);
+
 	/* TODO: update ml_info based on ML IE */
 
 	offset = ML_CMN_INFO_OFFSET;
 	/* TODO: Add proper parsing based on presense bitmap */
 	if (multi_link_ctrl & CMN_INFO_MLD_ADDR_PRESENT_BIT) {
-		qdf_mem_copy(&scan_entry->ml_info->mld_mac_addr,
+		qdf_mem_copy(&scan_entry->ml_info.mld_mac_addr,
 			     ml_ie + offset, 6);
 		offset += 6;
 	}
 
 	/* TODO: Decode it from ML IE */
-	scan_entry->ml_info->num_links = 2;
+	scan_entry->ml_info.num_links = 2;
 
 	/**
 	 * Copy Link ID & MAC address of the scan cache entry as first entry
 	 * in the partner info list
 	 */
 	if (multi_link_ctrl & CMN_INFO_LINK_ID_PRESENT_BIT)
-		scan_entry->ml_info->self_link_id = ml_ie[offset] & 0x0F;
+		scan_entry->ml_info.self_link_id = ml_ie[offset] & 0x0F;
 
 	util_get_partner_link_info(scan_entry);
 }