diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index dcb67840fc4e..5ce328236c7e 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -160,7 +160,7 @@ void csr_reinit_wm_status_change_cmd(struct mac_context *mac, tSmeCmd *pCommand); QDF_STATUS csr_roam_send_set_key_cmd(struct mac_context *mac_ctx, uint32_t session_id, struct setkey_cmd *set_key_cmd); -QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum); +QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint32_t freq); QDF_STATUS sme_acquire_global_lock(struct sme_context *sme); QDF_STATUS sme_release_global_lock(struct sme_context *sme); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 88072d9b4626..f4122b9a3f06 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -3204,7 +3204,7 @@ void csr_prune_channel_list_for_mode(struct mac_context *mac_ctx, } #define INFRA_AP_DEFAULT_CHAN_FREQ 2437 -QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum) +QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint32_t freq) { uint8_t index = 0; QDF_STATUS status = QDF_STATUS_E_NOSUPPORT; @@ -3213,7 +3213,7 @@ QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum) for (index = 0; index < mac->scan.base_channels.numChannels; index++) { if (mac->scan.base_channels.channel_freq_list[index] == - wlan_reg_chan_to_freq(mac->pdev, chnNum)) { + freq){ status = QDF_STATUS_SUCCESS; break; } @@ -3221,7 +3221,7 @@ QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum) if (QDF_STATUS_SUCCESS != status) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - FL("channel %d is not available"), chnNum); + FL("freq %d is not available"), freq); } return status; @@ -14540,8 +14540,7 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId, pParam->ApUapsdEnable = pProfile->ApUapsdEnable; pParam->ssidHidden = pProfile->SSIDs.SSIDList[0].ssidHidden; if (CSR_IS_INFRA_AP(pProfile) && (pParam->operation_chan_freq != 0)) { - if (csr_is_valid_channel(mac, wlan_reg_freq_to_chan(mac->pdev, - pParam->operation_chan_freq)) != + if (csr_is_valid_channel(mac, pParam->operation_chan_freq) != QDF_STATUS_SUCCESS) { pParam->operation_chan_freq = INFRA_AP_DEFAULT_CHAN_FREQ; pParam->ch_params.ch_width = CH_WIDTH_20MHZ;