Kaynağa Gözat

qcacmn: Rename multi_link into multi_link_bv

In struct ie_list, rename multi_link variable into
multi_link_bv.

Change-Id: Icfa26f20f9004c6e342add97a34505f45372c636
CRs-Fixed: 3313417
Deeksha Gupta 2 yıl önce
ebeveyn
işleme
433dee00be

+ 1 - 1
umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c

@@ -1700,7 +1700,7 @@ static enum MLO_TYPE  cm_bss_mlo_type(struct wlan_objmgr_psoc *psoc,
 	bool multi_link = false;
 
 	mlo_link_num = cm_get_sta_mlo_conn_max_num(psoc);
-	if (!entry->ie_list.multi_link)
+	if (!entry->ie_list.multi_link_bv)
 		return SLO;
 	else if (!entry->ml_info.num_links)
 		return SLO;

+ 2 - 2
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c

@@ -471,7 +471,7 @@ static void cm_update_vdev_mlme_macaddr(struct cnx_mgr *cm_ctx,
 	if (!eht_capab)
 		return;
 
-	if (req->cur_candidate->entry->ie_list.multi_link) {
+	if (req->cur_candidate->entry->ie_list.multi_link_bv) {
 		wlan_vdev_obj_lock(cm_ctx->vdev);
 		/* Use link address for ML connection */
 		wlan_vdev_mlme_set_macaddr(cm_ctx->vdev,
@@ -544,7 +544,7 @@ static void
 cm_candidate_mlo_update(struct scan_cache_entry *scan_entry,
 			struct validate_bss_data *validate_bss_info)
 {
-	validate_bss_info->is_mlo = !!scan_entry->ie_list.multi_link;
+	validate_bss_info->is_mlo = !!scan_entry->ie_list.multi_link_bv;
 	validate_bss_info->scan_entry = scan_entry;
 }
 #else

+ 1 - 1
umac/scan/core/src/wlan_scan_filter.c

@@ -699,7 +699,7 @@ static bool util_mlo_filter_match(struct wlan_objmgr_pdev *pdev,
 	struct partner_link_info *partner_link;
 	bool is_disabled;
 
-	if (!db_entry->ie_list.multi_link)
+	if (!db_entry->ie_list.multi_link_bv)
 		return true;
 	if (!filter->band_bitmap)
 		return true;

+ 2 - 2
umac/scan/dispatcher/inc/wlan_scan_public_structs.h

@@ -202,7 +202,7 @@ struct channel_info {
  * @rsnxe: Pointer to rsnxe IE
  * @ehtcap: pointer to ehtcap ie
  * @ehtop: pointer to eht op ie
- * @multi_link: pointer to multi link IE
+ * @multi_link_bv: pointer to multi link basic variant IE
  * @bwnss_map: pointer to NSS map IE
  * @secchanoff: pointer to secondary chan IE
  * @mdie: pointer to md IE
@@ -269,7 +269,7 @@ struct ie_list {
 	uint8_t *ehtop;
 #endif
 #ifdef WLAN_FEATURE_11BE_MLO
-	uint8_t *multi_link;
+	uint8_t *multi_link_bv;
 #endif
 	uint8_t *qcn;
 

+ 2 - 1
umac/scan/dispatcher/inc/wlan_scan_utils_api.h

@@ -740,7 +740,8 @@ util_scan_copy_beacon_data(struct scan_cache_entry *new_entry,
 	ie_lst->ehtop = conv_ptr(ie_lst->ehtop, old_ptr, new_ptr);
 #endif
 #ifdef WLAN_FEATURE_11BE_MLO
-	ie_lst->multi_link = conv_ptr(ie_lst->multi_link, old_ptr, new_ptr);
+	ie_lst->multi_link_bv =
+			conv_ptr(ie_lst->multi_link_bv, old_ptr, new_ptr);
 #endif
 	ie_lst->qcn = conv_ptr(ie_lst->qcn, old_ptr, new_ptr);
 

+ 6 - 7
umac/scan/dispatcher/src/wlan_scan_utils_api.c

@@ -1155,7 +1155,7 @@ static void util_scan_parse_ml_ie(struct scan_cache_entry *scan_params,
 				  struct extn_ie_header *extn_ie)
 {
 	if (extn_ie->ie_extn_id == WLAN_EXTN_ELEMID_MULTI_LINK)
-		scan_params->ie_list.multi_link = (uint8_t *)extn_ie;
+		scan_params->ie_list.multi_link_bv = (uint8_t *)extn_ie;
 }
 #else
 static void util_scan_parse_ml_ie(struct scan_cache_entry *scan_params,
@@ -2111,9 +2111,9 @@ static uint8_t util_get_link_info_offset(uint8_t *ml_ie)
 	return 0;
 }
 
-static void util_get_partner_link_info(struct scan_cache_entry *scan_entry)
+static void util_get_ml_bv_partner_link_info(struct scan_cache_entry *scan_entry)
 {
-	uint8_t *ml_ie = scan_entry->ie_list.multi_link;
+	uint8_t *ml_ie = scan_entry->ie_list.multi_link_bv;
 	uint8_t offset = util_get_link_info_offset(ml_ie);
 	uint16_t sta_ctrl;
 	uint8_t *stactrl_offset = NULL, *ielist_offset;
@@ -2228,13 +2228,12 @@ 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;
+	uint8_t *ml_ie = scan_entry->ie_list.multi_link_bv;
 	uint16_t multi_link_ctrl;
 	uint8_t offset;
 
-	if (!scan_entry->ie_list.multi_link) {
+	if (!scan_entry->ie_list.multi_link_bv)
 		return;
-	}
 
 	multi_link_ctrl = *(uint16_t *)(ml_ie + ML_CONTROL_OFFSET);
 
@@ -2260,7 +2259,7 @@ static void util_scan_update_ml_info(struct scan_cache_entry *scan_entry)
 	if (multi_link_ctrl & CMN_INFO_LINK_ID_PRESENT_BIT)
 		scan_entry->ml_info.self_link_id = ml_ie[offset] & 0x0F;
 
-	util_get_partner_link_info(scan_entry);
+	util_get_ml_bv_partner_link_info(scan_entry);
 }
 #else
 static void util_scan_update_ml_info(struct scan_cache_entry *scan_entry)