Browse Source

qcacld-3.0: Convert SME code legacy channel ID usage

1) Change csr_get_cfg_valid_channels's code to make it
   use channel frequencies directly to calculate a
   valid channel list.

2) Add kernel-doc for csr_get_cfg_valid_channels.

3) Remove the definition, declaration and usage of
   csr_get_cfg_valid_freq as csr_get_cfg_valid_channels
   does exactly the same job.

Change-Id: I6745cb2220bf9387c64ac8c271297cb89f821ab3
CRs-Fixed: 2560091
wadesong 5 years ago
parent
commit
2bab3a5b7c
3 changed files with 9 additions and 37 deletions
  1. 1 24
      core/sme/src/csr/csr_api_roam.c
  2. 6 10
      core/sme/src/csr/csr_inside_api.h
  3. 2 3
      core/sme/src/rrm/sme_rrm.c

+ 1 - 24
core/sme/src/csr/csr_api_roam.c

@@ -13817,22 +13817,19 @@ QDF_STATUS csr_roam_issue_stop_bss(struct mac_context *mac,
 	return status;
 }
 
-/* pNumChan is a caller allocated space with the sizeof pChannels */
 QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
 				      uint32_t *ch_freq_list,
 				      uint32_t *num_ch_freq)
 {
 	uint8_t num_chan_temp = 0;
 	int i;
-	uint8_t chan;
 	uint32_t *valid_ch_freq_list =
 				mac->mlme_cfg->reg.valid_channel_freq_list;
 
 	*num_ch_freq = mac->mlme_cfg->reg.valid_channel_list_num;
 
 	for (i = 0; i < *num_ch_freq; i++) {
-		chan = wlan_reg_freq_to_chan(mac->pdev, valid_ch_freq_list[i]);
-		if (!wlan_reg_is_dsrc_chan(mac->pdev, chan)) {
+		if (!wlan_reg_is_dsrc_freq(valid_ch_freq_list[i])) {
 			ch_freq_list[num_chan_temp] = valid_ch_freq_list[i];
 			num_chan_temp++;
 		}
@@ -13842,26 +13839,6 @@ QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS csr_get_cfg_valid_freqs(struct mac_context *mac,
-				   uint32_t *freq_list,
-				   uint32_t *num_of_freq)
-{
-	uint8_t num_chan_temp = 0;
-	int i;
-	uint32_t chan;
-
-	for (i = 0; i < mac->mlme_cfg->reg.valid_channel_list_num; i++) {
-		chan = mac->mlme_cfg->reg.valid_channel_freq_list[i];
-		if (!wlan_reg_is_dsrc_chan(mac->pdev, wlan_reg_freq_to_chan(mac->pdev, chan))) {
-			freq_list[num_chan_temp] = chan;
-			num_chan_temp++;
-		}
-	}
-
-	*num_of_freq = num_chan_temp;
-	return QDF_STATUS_SUCCESS;
-}
-
 int8_t csr_get_cfg_max_tx_power(struct mac_context *mac, uint32_t ch_freq)
 {
 	uint32_t cfg_length = 0;

+ 6 - 10
core/sme/src/csr/csr_inside_api.h

@@ -312,23 +312,19 @@ bool csr_roam_is_channel_valid(struct mac_context *mac, uint8_t ch_freq);
  */
 bool csr_roam_is_chan_freq_valid(struct mac_context *mac, uint32_t freq);
 
-/* pNumChan is a caller allocated space with the sizeof pChannels */
-QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
-				      uint32_t *ch_freq_list,
-				      uint32_t *num_ch_freq);
 /**
- * csr_get_cfg_valid_freqs() - Get valid channel frequency list
+ * csr_get_cfg_valid_channels() - Get valid channel frequency list
  * @mac: mac context
- * @freq_list: valid channel frequencies
- * @num_of_freq: valid channel nummber
+ * @ch_freq_list: valid channel frequencies
+ * @num_ch_freq: valid channel nummber
  *
  * This function returns the valid channel frequencies.
  *
  * Return: QDF_STATUS_SUCCESS for success.
  */
-QDF_STATUS csr_get_cfg_valid_freqs(struct mac_context *mac,
-				   uint32_t *freq_list,
-				   uint32_t *num_of_freq);
+QDF_STATUS csr_get_cfg_valid_channels(struct mac_context *mac,
+				      uint32_t *ch_freq_list,
+				      uint32_t *num_ch_freq);
 
 int8_t csr_get_cfg_max_tx_power(struct mac_context *mac, uint32_t ch_freq);
 

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

@@ -1084,9 +1084,8 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 			pSmeRrmContext->channelList.numOfChannels = 0;
 			goto cleanup;
 		}
-		csr_get_cfg_valid_freqs(mac,
-					pSmeRrmContext->channelList.freq_list,
-					&len);
+		csr_get_cfg_valid_channels(
+			mac, pSmeRrmContext->channelList.freq_list, &len);
 
 		if (pBeaconReq->channelInfo.regulatoryClass) {
 			if (sme_rrm_fill_scan_channels(mac, country,