qcacld-3.0: Replace channel id with frequency

Replace channel ID with channel frequency in struct tpSirChanChangeRequest

Change-Id: I37d1a17933b1c845bd3340f20717d667a629ec05
CRs-Fixed: 2555401
This commit is contained in:
Amruta Kulkarni
2019-10-29 13:40:34 -07:00
committed by nshrivas
parent 27359056bd
commit f560253148
3 changed files with 8 additions and 10 deletions

View File

@@ -2742,7 +2742,7 @@ typedef struct sSirSmeDfsEventInd {
typedef struct sSirChanChangeRequest {
uint16_t messageType;
uint16_t messageLen;
uint8_t targetChannel;
uint32_t target_chan_freq;
uint8_t sec_ch_offset;
enum phy_ch_width ch_width;
uint8_t center_freq_seg_0;

View File

@@ -5019,11 +5019,10 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
}
ch_change_req = (tpSirChanChangeRequest)msg_buf;
target_freq = wlan_reg_chan_to_freq(
mac_ctx->pdev, ch_change_req->targetChannel);
target_freq = ch_change_req->target_chan_freq;
max_tx_pwr = lim_get_regulatory_max_transmit_power(
mac_ctx, ch_change_req->targetChannel);
max_tx_pwr = wlan_reg_get_channel_reg_power_for_freq(
mac_ctx->pdev, target_freq);
if ((ch_change_req->messageType != eWNI_SME_CHANNEL_CHANGE_REQ) ||
(max_tx_pwr == WMA_MAX_TXPOWER_INVALID)) {

View File

@@ -20395,13 +20395,12 @@ QDF_STATUS csr_roam_channel_change_req(struct mac_context *mac,
msg->messageType = eWNI_SME_CHANNEL_CHANGE_REQ;
msg->messageLen = sizeof(tSirChanChangeRequest);
msg->targetChannel = wlan_reg_freq_to_chan(
mac->pdev, profile->ChannelInfo.freq_list[0]);
msg->target_chan_freq = profile->ChannelInfo.freq_list[0];
msg->sec_ch_offset = ch_params->sec_ch_offset;
msg->ch_width = profile->ch_params.ch_width;
msg->dot11mode = csr_translate_to_wni_cfg_dot11_mode(mac,
param.uCfgDot11Mode);
if (IS_24G_CH(msg->targetChannel) &&
if (WLAN_REG_IS_24GHZ_CH_FREQ(msg->target_chan_freq) &&
!mac->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band &&
(msg->dot11mode == MLME_DOT11_MODE_11AC ||
msg->dot11mode == MLME_DOT11_MODE_11AC_ONLY))
@@ -20418,8 +20417,8 @@ QDF_STATUS csr_roam_channel_change_req(struct mac_context *mac,
qdf_mem_copy(&msg->extended_rateset, &param.extendedRateSet,
sizeof(msg->extended_rateset));
sme_debug("target_chan %d ch_width %d dot11mode %d",
msg->targetChannel, msg->ch_width, msg->dot11mode);
sme_debug("target_chan_freq %d ch_width %d dot11mode %d",
msg->target_chan_freq, msg->ch_width, msg->dot11mode);
status = umac_send_mb_message_to_mac(msg);
return status;