From 5d162769f58da7d4c12fe74e5f39b9c0becc10da Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Thu, 7 Nov 2019 20:03:40 +0800 Subject: [PATCH] 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 --- core/sme/inc/sme_api.h | 6 ------ core/sme/src/common/sme_api.c | 13 ------------- core/sme/src/csr/csr_neighbor_roam.c | 6 +++--- core/sme/src/rrm/sme_rrm.c | 5 +++-- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 1223591fd219..5c3ebe321aca 100644 --- a/core/sme/inc/sme_api.h +++ b/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, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index dc548a1f08bf..902862c37dd2 100644 --- a/core/sme/src/common/sme_api.c +++ b/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, diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index e7524abbda17..238392729ed7 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/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) diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 992a00e5c906..479325d5621e 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/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)