qcacld-3.0: Replace currentOperChannel with curr_op_freq
Replace currentOperChannel with curr_op_freq in files:
lim_process_tdls.c
lim_reassoc_utils.c
lim_send_frames_host_roam.c
lim_send_management_frames.c
lim_send_messages.c
Change-Id: I62765838b6ac5f068854d45f82c541b67a78c76a
CRs-Fixed: 2492966
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 02e59a9..269e027 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -208,7 +208,7 @@
qdf_mem_copy(validChan, mac->mlme_cfg->reg.valid_channel_list,
mac->mlme_cfg->reg.valid_channel_list_num);
- if (IS_5G_CH(pe_session->currentOperChannel))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq))
band = BAND_5G;
else
band = BAND_2G;
@@ -266,14 +266,14 @@
op_class = wlan_reg_dmn_get_opclass_from_channel(
mac->scan.countryCodeCurrent,
- pe_session->currentOperChannel,
+ wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq),
chanOffset);
- pe_debug("countryCodeCurrent: %s, currentOperChannel: %d, htSecondaryChannelOffset: %d, chanOffset: %d op class: %d",
- mac->scan.countryCodeCurrent,
- pe_session->currentOperChannel,
- pe_session->htSecondaryChannelOffset,
- chanOffset, op_class);
+ pe_debug("countryCodeCurrent: %s, curr_op_freq: %d, htSecondaryChannelOffset: %d, chanOffset: %d op class: %d",
+ mac->scan.countryCodeCurrent,
+ pe_session->curr_op_freq,
+ pe_session->htSecondaryChannelOffset,
+ chanOffset, op_class);
suppOperClasses->present = 1;
suppOperClasses->classes[0] = op_class;
@@ -678,7 +678,7 @@
vht_cap_info = &mac->mlme_cfg->vht_caps.vht_cap_info;
- if (IS_5G_CH(pe_session->currentOperChannel))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq))
nss = mac->vdev_type_nss_5g.tdls;
else
nss = mac->vdev_type_nss_2g.tdls;
@@ -716,9 +716,10 @@
}
pe_debug("HT present: %hu, Chan Width: %hu",
htCap->present, htCap->supportedChannelWidthSet);
- if (((pe_session->currentOperChannel <= SIR_11B_CHANNEL_END) &&
- vht_cap_info->b24ghz_band) ||
- (pe_session->currentOperChannel >= SIR_11B_CHANNEL_END)) {
+ if (((wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) <=
+ SIR_11B_CHANNEL_END) && vht_cap_info->b24ghz_band) ||
+ (wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) >=
+ SIR_11B_CHANNEL_END)) {
if (IS_DOT11_MODE_VHT(selfDot11Mode) &&
IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
/* Include VHT Capability IE */
@@ -829,7 +830,8 @@
if (QDF_STATUS_E_FAILURE == populate_dot11f_rates_tdls(mac,
&tdlsDisRsp.SuppRates,
&tdlsDisRsp.ExtSuppRates,
- pe_session->currentOperChannel))
+ wlan_reg_freq_to_chan(
+ mac->pdev, pe_session->curr_op_freq)))
pe_err("could not populate supported data rates");
/* populate extended capability IE */
@@ -980,9 +982,11 @@
tDot11fIEAID *Aid,
struct pe_session *pe_session)
{
- if (((pe_session->currentOperChannel <= SIR_11B_CHANNEL_END) &&
+ if (((wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) <=
+ SIR_11B_CHANNEL_END) &&
mac->mlme_cfg->vht_caps.vht_cap_info.b24ghz_band) ||
- (pe_session->currentOperChannel >= SIR_11B_CHANNEL_END)) {
+ (wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) >=
+ SIR_11B_CHANNEL_END)) {
if (IS_DOT11_MODE_VHT(selfDot11Mode) &&
IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
@@ -1138,7 +1142,8 @@
if (QDF_STATUS_E_FAILURE == populate_dot11f_rates_tdls(mac,
&tdlsSetupReq.SuppRates,
&tdlsSetupReq.ExtSuppRates,
- pe_session->currentOperChannel))
+ wlan_reg_freq_to_chan(
+ mac->pdev, pe_session->curr_op_freq)))
pe_err("could not populate supported data rates");
/* Populate extended capability IE */
@@ -1598,7 +1603,8 @@
if (QDF_STATUS_E_FAILURE == populate_dot11f_rates_tdls(mac,
&tdlsSetupRsp.SuppRates,
&tdlsSetupRsp.ExtSuppRates,
- pe_session->currentOperChannel))
+ wlan_reg_freq_to_chan(
+ mac->pdev, pe_session->curr_op_freq)))
pe_err("could not populate supported data rates");
/* Populate extended capability IE */
@@ -2350,7 +2356,7 @@
}
}
- if (IS_5G_CH(session_entry->currentOperChannel))
+ if (wlan_reg_is_5ghz_ch_freq(session_entry->curr_op_freq))
nss = mac_ctx->vdev_type_nss_5g.tdls;
else
nss = mac_ctx->vdev_type_nss_2g.tdls;
@@ -2499,7 +2505,8 @@
*/
if (pe_session->htSupportedChannelWidthSet) {
cbMode = lim_select_cb_mode(sta, pe_session,
- pe_session->currentOperChannel,
+ wlan_reg_freq_to_chan(
+ mac->pdev, pe_session->curr_op_freq),
sta->vhtSupportedChannelWidthSet);
if (sta->mlmStaContext.vhtCapability)
diff --git a/core/mac/src/pe/lim/lim_reassoc_utils.c b/core/mac/src/pe/lim/lim_reassoc_utils.c
index 362bb0b..a8a3f0a 100644
--- a/core/mac/src/pe/lim/lim_reassoc_utils.c
+++ b/core/mac/src/pe/lim/lim_reassoc_utils.c
@@ -472,13 +472,15 @@
/* 'Change' timer for future activations */
lim_deactivate_and_change_timer(mac, eLIM_REASSOC_FAIL_TIMER);
- lim_set_channel(mac, pe_session->currentOperChannel,
- pe_session->ch_center_freq_seg0,
- pe_session->ch_center_freq_seg1,
- pe_session->ch_width,
- pe_session->maxTxPower,
- pe_session->peSessionId,
- 0, 0);
+ lim_set_channel(
+ mac,
+ wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq),
+ pe_session->ch_center_freq_seg0,
+ pe_session->ch_center_freq_seg1,
+ pe_session->ch_width,
+ pe_session->maxTxPower,
+ pe_session->peSessionId,
+ 0, 0);
/* @ToDo:Need to Integrate the STOP the Dataxfer to AP from 11H code */
diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
index e9b844a..1cf7658 100644
--- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c
+++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
@@ -408,12 +408,13 @@
(uint8_t *) frame, (bytes + ft_ies_length));
if ((pe_session->ftPEContext.pFTPreAuthReq) &&
- (BAND_5G == lim_get_rf_band(
- pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
+ (lim_get_rf_band(
+ pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)) ==
+ BAND_5G)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
- else if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ else if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->assocReq) {
@@ -761,9 +762,9 @@
pe_session->assocReqLen = nPayload;
}
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->opmode == QDF_P2P_CLIENT_MODE ||
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index f409806..eaefec2 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -556,8 +556,10 @@
populate_dot11f_supp_rates(mac_ctx, POPULATE_DOT11F_RATES_OPERATIONAL,
&frm->SuppRates, pe_session);
- populate_dot11f_ds_params(mac_ctx, &frm->DSParams,
- pe_session->currentOperChannel);
+ populate_dot11f_ds_params(
+ mac_ctx, &frm->DSParams,
+ wlan_reg_freq_to_chan(mac_ctx->pdev,
+ pe_session->curr_op_freq));
populate_dot11f_ibss_params(mac_ctx, &frm->IBSSParams, pe_session);
if (LIM_IS_AP_ROLE(pe_session)) {
@@ -773,9 +775,9 @@
}
}
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
/* Queue Probe Response frame in high priority WQ */
@@ -981,9 +983,9 @@
pe_debug("Sending an Add TS Request frame to");
lim_print_mac_addr(mac, peerMacAddr, LOGD);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -1353,10 +1355,9 @@
sta->mlmStaContext.owe_ie,
sta->mlmStaContext.owe_ie_len);
- if ((BAND_5G ==
- lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -1501,9 +1502,9 @@
pe_debug("Sending DELTS REQ (size %d) to ", nBytes);
lim_print_mac_addr(mac, pMacHdr->da, LOGD);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -2139,9 +2140,9 @@
pe_session->assocReqLen = payload;
}
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (pe_session->opmode == QDF_P2P_CLIENT_MODE ||
@@ -2601,12 +2602,13 @@
frame, frame_len);
if ((session->ftPEContext.pFTPreAuthReq) &&
- (BAND_5G == lim_get_rf_band(
- session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
+ (lim_get_rf_band(
+ session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)) ==
+ BAND_5G)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
- else if ((BAND_5G == lim_get_rf_band(session->currentOperChannel)) ||
- (session->opmode == QDF_P2P_CLIENT_MODE) ||
- (session->opmode == QDF_P2P_GO_MODE))
+ else if (wlan_reg_is_5ghz_ch_freq(session->curr_op_freq) ||
+ session->opmode == QDF_P2P_CLIENT_MODE ||
+ session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
if (session->opmode == QDF_P2P_CLIENT_MODE ||
@@ -3042,9 +3044,9 @@
waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr));
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
@@ -3232,9 +3234,9 @@
QDF_MAC_ADDR_ARRAY(pMacHdr->da),
QDF_MAC_ADDR_ARRAY(pe_session->self_mac_addr));
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
@@ -3662,9 +3664,9 @@
nStatus);
}
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -3802,9 +3804,9 @@
status);
}
- if ((BAND_5G == lim_get_rf_band(session_entry->currentOperChannel)) ||
- (session_entry->opmode == QDF_P2P_CLIENT_MODE) ||
- (session_entry->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(session_entry->curr_op_freq) ||
+ session_entry->opmode == QDF_P2P_CLIENT_MODE ||
+ session_entry->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
pe_debug("Send Ext channel Switch to :"QDF_MAC_ADDR_STR" with swcount %d, swmode %d , newchannel %d newops %d",
@@ -3954,14 +3956,13 @@
status);
}
- if ((BAND_5G ==
- lim_get_rf_band(session_entry->currentOperChannel)) ||
- (session_entry->opmode == QDF_P2P_CLIENT_MODE) ||
- (session_entry->opmode == QDF_P2P_GO_MODE)) {
+ if (wlan_reg_is_5ghz_ch_freq(session_entry->curr_op_freq) ||
+ session_entry->opmode == QDF_P2P_CLIENT_MODE ||
+ session_entry->opmode == QDF_P2P_GO_MODE) {
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- pe_debug("Send frame on channel %d to mac "
- QDF_MAC_ADDR_STR, session_entry->currentOperChannel,
+ pe_debug("Send frame on channel freq %d to mac "
+ QDF_MAC_ADDR_STR, session_entry->curr_op_freq,
QDF_MAC_ADDR_ARRAY(peer));
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -4090,9 +4091,9 @@
pe_debug("Sending a Neighbor Report Request to");
lim_print_mac_addr(mac, peer, LOGD);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -4234,9 +4235,9 @@
pe_warn("Sending a Link Report to");
lim_print_mac_addr(mac, peer, LOGW);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -4405,9 +4406,9 @@
pe_warn("Sending a Radio Measure Report to");
lim_print_mac_addr(mac, peer, LOGW);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) ||
- (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE))
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -4538,12 +4539,9 @@
pe_debug("Sending an SA Query Request from ");
lim_print_mac_addr(mac, pe_session->self_mac_addr, LOGD);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
- || (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE)
-#endif
- )
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
smeSessionId = pe_session->smeSessionId;
@@ -4669,12 +4667,9 @@
pe_debug("Sending a SA Query Response to");
lim_print_mac_addr(mac, peer, LOGD);
- if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
- || (pe_session->opmode == QDF_P2P_CLIENT_MODE) ||
- (pe_session->opmode == QDF_P2P_GO_MODE)
-#endif
- )
+ if (wlan_reg_is_5ghz_ch_freq(pe_session->curr_op_freq) ||
+ pe_session->opmode == QDF_P2P_CLIENT_MODE ||
+ pe_session->opmode == QDF_P2P_GO_MODE)
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
@@ -4879,12 +4874,9 @@
}
- if ((BAND_5G == lim_get_rf_band(session->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
- || (session->opmode == QDF_P2P_CLIENT_MODE) ||
- (session->opmode == QDF_P2P_GO_MODE)
-#endif
- )
+ if (wlan_reg_is_5ghz_ch_freq(session->curr_op_freq) ||
+ session->opmode == QDF_P2P_CLIENT_MODE ||
+ session->opmode == QDF_P2P_GO_MODE)
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c
index 8daaa9a..e2e0741 100644
--- a/core/mac/src/pe/lim/lim_send_messages.c
+++ b/core/mac/src/pe/lim/lim_send_messages.c
@@ -625,7 +625,8 @@
ht40_obss_scanind->current_operatingclass =
wlan_reg_dmn_get_opclass_from_channel(
mac_ctx->scan.countryCodeCurrent,
- session->currentOperChannel,
+ wlan_reg_freq_to_chan(
+ mac_ctx->pdev, session->curr_op_freq),
session->ch_width);
channelnum = mac_ctx->mlme_cfg->reg.valid_channel_list_num;
qdf_mem_copy(chan_list, mac_ctx->mlme_cfg->reg.valid_channel_list,