Explorar el Código

qcacld-3.0: Convert SME code legacy channel ID usage

Remove usage of sme_freq_to_chan_list from:

csr_neighbor_roam_get_scan_filter_from_profile
sme_rrm_send_scan_result

Change-Id: I67f968c306d31f1e17cc9434274f65600cb39b02
CRs-fixed: 2561229
Jianmin Zhu hace 5 años
padre
commit
5d162769f5

+ 0 - 6
core/sme/inc/sme_api.h

@@ -3858,12 +3858,6 @@ QDF_STATUS sme_register_bcn_recv_pause_ind_cb(mac_handle_t mac_handle,
 QDF_STATUS sme_set_disconnect_ies(mac_handle_t mac_handle, uint8_t vdev_id,
 				  uint8_t *ie_data, uint16_t ie_len);
 
-void sme_freq_to_chan_list(
-			struct wlan_objmgr_pdev *pdev,
-			uint8_t *chan_list,
-			uint32_t *freq_list,
-			uint32_t chan_list_len);
-
 void sme_chan_to_freq_list(
 			struct wlan_objmgr_pdev *pdev,
 			uint32_t *freq_list,

+ 0 - 13
core/sme/src/common/sme_api.c

@@ -16013,19 +16013,6 @@ QDF_STATUS sme_set_disconnect_ies(mac_handle_t mac_handle, uint8_t vdev_id,
 	return QDF_STATUS_SUCCESS;
 }
 
-void sme_freq_to_chan_list(
-			struct wlan_objmgr_pdev *pdev,
-			uint8_t *chan_list,
-			uint32_t *freq_list,
-			uint32_t chan_list_len)
-{
-	uint32_t count;
-
-	for (count = 0; count < chan_list_len; count++)
-		chan_list[count] =
-			(uint8_t)wlan_reg_freq_to_chan(pdev, freq_list[count]);
-}
-
 void sme_chan_to_freq_list(
 			struct wlan_objmgr_pdev *pdev,
 			uint32_t *freq_list,

+ 3 - 3
core/sme/src/csr/csr_neighbor_roam.c

@@ -414,9 +414,9 @@ csr_neighbor_roam_get_scan_filter_from_profile(struct mac_context *mac,
 		filter->num_of_channels = num_ch;
 		if (filter->num_of_channels > QDF_MAX_NUM_CHAN)
 			filter->num_of_channels = QDF_MAX_NUM_CHAN;
-		sme_freq_to_chan_list(mac->pdev, filter->channel_list,
-				      chan_info->freq_list,
-				      filter->num_of_channels);
+		qdf_mem_copy(filter->chan_freq_list, chan_info->freq_list,
+			     filter->num_of_channels *
+			     sizeof(filter->chan_freq_list[0]));
 	}
 
 	if (nbr_roam_info->is11rAssoc)

+ 3 - 2
core/sme/src/rrm/sme_rrm.c

@@ -467,8 +467,9 @@ static QDF_STATUS sme_rrm_send_scan_result(struct mac_context *mac_ctx,
 	filter->num_of_channels = num_chan;
 	if (filter->num_of_channels > QDF_MAX_NUM_CHAN)
 		filter->num_of_channels = QDF_MAX_NUM_CHAN;
-	sme_freq_to_chan_list(mac_ctx->pdev, filter->channel_list,
-			      freq_list, filter->num_of_channels);
+	qdf_mem_copy(filter->chan_freq_list, freq_list,
+		     filter->num_of_channels *
+		     sizeof(filter->chan_freq_list[0]));
 	filter->rrm_measurement_filter = true;
 	/*
 	 * In case this is beacon report request from last AP (before roaming)