lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace currentOperChannel with curr_op_freq

Browse Source 
Replace currentOperChannel with curr_op_freq in files:
lim_api.c lim_assoc_utils.c lim_ft.c

Change-Id: I2f06f0d10523fa0266509e860a13f57b5c35c0ee
CRs-Fixed: 2489616
This commit is contained in:
Liangwei Dong 2019-07-12 13:57:48 +08:00 committed by nshrivas
parent 121bcb3def
commit 075f663a16
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/mac/src/pe/lim/lim_api.c
View File

@ -1337,8 +1337,9 @@ void
lim_received_hb_handler(struct mac_context *mac, uint8_t channelId,
struct pe_session *pe_session)
{
if ((channelId == 0)
|| (channelId == pe_session->currentOperChannel))
if (channelId == 0 ||
channelId == wlan_reg_freq_to_chan(mac->pdev,
pe_session->curr_op_freq))
pe_session->LimRxedBeaconCntDuringHB++;
pe_session->pmmOffloadInfo.bcnmiss = false;
@ -1476,7 +1477,8 @@ lim_handle_ibss_coalescing(struct mac_context *mac,
*/
if ((!pBeacon->capabilityInfo.ibss) ||
lim_cmp_ssid(&pBeacon->ssId, pe_session) ||
(pe_session->currentOperChannel != pBeacon->channelNumber))
(wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq)
!= pBeacon->channelNumber))
retCode = QDF_STATUS_E_INVAL;
else if (lim_ibss_enc_type_matched(pBeacon, pe_session) != true) {
pe_debug("peer privacy: %d peer wpa: %d peer rsn: %d self encType: %d",
@ -1628,7 +1630,8 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
SIR_MAC_GET_PRIVACY(pe_session->limCurrentBssCaps)) ||
(SIR_MAC_GET_QOS(apNewCaps.capabilityInfo) !=
SIR_MAC_GET_QOS(pe_session->limCurrentBssCaps)) ||
((newChannel != pe_session->currentOperChannel) &&
((newChannel != wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq)) &&
(newChannel != 0)) ||
(false == security_caps_matched)
))) {
@ -1643,12 +1646,14 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
pe_session->fWaitForProbeRsp = true;
pe_warn("AP capabilities are not matching, sending directed probe request");
status =
lim_send_probe_req_mgmt_frame(mac, &pe_session->ssId,
pe_session->bssId,
pe_session->currentOperChannel,
pe_session->self_mac_addr,
pe_session->dot11mode,
NULL, NULL);
lim_send_probe_req_mgmt_frame(
mac, &pe_session->ssId,
pe_session->bssId,
wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq),
pe_session->self_mac_addr,
pe_session->dot11mode,
NULL, NULL);
if (QDF_STATUS_SUCCESS != status) {
pe_err("send ProbeReq failed");
@ -1665,9 +1670,12 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
qdf_mem_copy(apNewCaps.bssId.bytes,
pe_session->bssId, QDF_MAC_ADDR_SIZE);
if (newChannel != pe_session->currentOperChannel) {
if (newChannel != wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq)) {
pe_err("Channel Change from %d --> %d Ignoring beacon!",
pe_session->currentOperChannel, newChannel);
wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq),
newChannel);
return;
}
@ -1686,7 +1694,8 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
pe_err("BSS Caps (Privacy) bit 0 in beacon, but WPA or RSN IE present, Ignore Beacon!");
return;
} else
apNewCaps.channelId = pe_session->currentOperChannel;
apNewCaps.channelId = wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq);
qdf_mem_copy((uint8_t *) &apNewCaps.ssId,
(uint8_t *) &pBeacon->ssId,
pBeacon->ssId.length + 1);

3
core/mac/src/pe/lim/lim_assoc_utils.c
View File

@ -4723,7 +4723,8 @@ QDF_STATUS lim_is_dot11h_power_capabilities_in_range(struct mac_context *mac,
uint8_t local_pwr_constraint;
localMaxTxPower = lim_get_regulatory_max_transmit_power(
mac, pe_session->currentOperChannel);
mac, wlan_reg_freq_to_chan(
mac->pdev, pe_session->curr_op_freq));
local_pwr_constraint = mac->mlme_cfg->power.local_power_constraint;
localMaxTxPower -= (int8_t)local_pwr_constraint;

16
core/mac/src/pe/lim/lim_ft.c
View File

@ -601,8 +601,8 @@ void lim_fill_ft_session(struct mac_context *mac,
ft_session->currentOperChannel =
wlan_reg_freq_to_chan(mac->pdev, ft_session->curr_op_freq);
ft_session->limRFBand = lim_get_rf_band(
ft_session->currentOperChannel);
ft_session->limRFBand = lim_get_rf_band(wlan_reg_freq_to_chan(
mac->pdev, ft_session->curr_op_freq));
lim_fill_dot11mode(mac, ft_session, pe_session, pBeaconStruct);
@ -615,7 +615,7 @@ void lim_fill_ft_session(struct mac_context *mac,
&& pBeaconStruct->HTCaps.present);
/* Assign default configured nss value in the new session */
if (IS_5G_CH(ft_session->currentOperChannel))
if (wlan_reg_is_5ghz_ch_freq(ft_session->curr_op_freq))
ft_session->vdev_nss = mac->vdev_type_nss_5g.sta;
else
ft_session->vdev_nss = mac->vdev_type_nss_2g.sta;
@ -697,9 +697,9 @@ void lim_fill_ft_session(struct mac_context *mac,
ft_session->shortSlotTimeSupported = true;
}
regMax = lim_get_regulatory_max_transmit_power(mac,
ft_session->
currentOperChannel);
regMax = lim_get_regulatory_max_transmit_power(
mac, wlan_reg_freq_to_chan(mac->pdev,
ft_session->curr_op_freq));
localPowerConstraint = regMax;
lim_extract_ap_capability(mac, (uint8_t *) pbssDescription->ieFields,
lim_get_ielen_from_bss_description(pbssDescription),
@ -725,9 +725,7 @@ void lim_fill_ft_session(struct mac_context *mac,
tx_pwr_attr.reg_max = regMax;
tx_pwr_attr.ap_tx_power = localPowerConstraint;
tx_pwr_attr.ini_tx_power = mac->mlme_cfg->power.max_tx_power;
tx_pwr_attr.frequency =
wlan_reg_get_channel_freq(mac->pdev,
ft_session->currentOperChannel);
tx_pwr_attr.frequency = ft_session->curr_op_freq;
#ifdef FEATURE_WLAN_ESE
ft_session->maxTxPower = lim_get_max_tx_power(mac, &tx_pwr_attr);