A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace currentOperChannel with curr_op_freq

Browse source 
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
This commit is contained in:
Liangwei Dong 2019-07-15 15:38:28 +08:00 • committed by nshrivas
commit 419d730d1e
5 changed files with 105 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

43
core/mac/src/pe/lim/lim_process_tdls.c
View file

@ -208,7 +208,7 @@ static void populate_dot11f_tdls_offchannel_params(
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 @@ static void populate_dot11f_tdls_offchannel_params(
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 @@ static void populate_dot11f_tdls_ht_vht_cap(struct mac_context *mac,
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 @@ static void populate_dot11f_tdls_ht_vht_cap(struct mac_context *mac,
}
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 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
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 @@ static void populate_dotf_tdls_vht_aid(struct mac_context *mac, uint32_t selfDot
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 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac,
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 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac,
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 @@ lim_tdls_populate_matching_rate_set(struct mac_context *mac_ctx,
}
}
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 @@ static void lim_tdls_update_hash_node_info(struct mac_context *mac,
*/
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)

16
core/mac/src/pe/lim/lim_reassoc_utils.c
View file

@ -472,13 +472,15 @@ lim_restore_pre_reassoc_state(struct mac_context *mac,
/* '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 */

17
core/mac/src/pe/lim/lim_send_frames_host_roam.c
View file

@ -408,12 +408,13 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
(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 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
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 ||

128
core/mac/src/pe/lim/lim_send_management_frames.c
View file

@ -556,8 +556,10 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
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 @@ lim_send_probe_rsp_mgmt_frame(struct mac_context *mac_ctx,
}
}
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 @@ lim_send_addts_req_action_frame(struct mac_context *mac,
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 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
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 @@ lim_send_delts_req_action_frame(struct mac_context *mac,
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 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
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 @@ alloc_packet:
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 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
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 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
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 @@ lim_send_channel_switch_mgmt_frame(struct mac_context *mac,
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 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
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 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
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 @@ lim_send_neighbor_report_request_frame(struct mac_context *mac,
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 @@ lim_send_link_report_action_frame(struct mac_context *mac,
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 @@ lim_send_radio_measure_report_action_frame(struct mac_context *mac,
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 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra
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 @@ QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
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 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
}
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,

3
core/mac/src/pe/lim/lim_send_messages.c
View file

@ -625,7 +625,8 @@ QDF_STATUS lim_send_ht40_obss_scanind(struct mac_context *mac_ctx,
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,