diff options
| author | Naveen Rawat <naveenrawat@codeaurora.org> | 2016-11-10 15:12:18 -0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-14 11:24:03 -0800 |
| commit | f47582f2154bd115af921e619286859238dfee96 (patch) | |
| tree | 4a6c692765bc7bb2f5793237c607f99157e6c218 /core | |
| parent | 69512f8336cece783e85145c01083bf7d1e26956 (diff) | |
qcacld-3.0: Do not overwrite cfg SU beam formee in lim_extract_ap_caps
WNI_CFG_VHT_SU_BEAMFORMEE_CAP is a global location for self capabilities
and is being overwritten with AP's capability, which is incorrect.
Because of this after roaming from an inferior capability AP to higher
capability AP, we are advertizing previous session's capability which is
wrong. Fix this by removing overwriting of WNI_CFG from function
lim_extract_ap_capability.
Change-Id: I5676598a008f3a118206e40c244faf38648e0b01
CRs-Fixed: 1088579
Diffstat (limited to 'core')
| -rw-r--r-- | core/mac/src/pe/lim/lim_prop_exts_utils.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 629f32b8a002..62823ea4b3bc 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -111,7 +111,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, { tSirProbeRespBeacon *beacon_struct; uint32_t enable_txbf_20mhz; - tSirRetStatus cfg_set_status = eSIR_FAILURE; tSirRetStatus cfg_get_status = eSIR_FAILURE; uint8_t ap_bcon_ch_width; bool new_ch_width_dfn = false; @@ -178,15 +177,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, } if (session->vhtCapabilityPresentInBeacon == 1 && - session->vht_config.su_beam_formee == 0) { - cfg_set_status = cfg_set_int(mac_ctx, - WNI_CFG_VHT_SU_BEAMFORMEE_CAP, - 0); - if (cfg_set_status != eSIR_SUCCESS) - lim_log(mac_ctx, LOGP, FL( - "Set VHT_SU_BEAMFORMEE_CAP Fail")); - } - if (session->vhtCapabilityPresentInBeacon == 1 && !session->htSupportedChannelWidthSet) { cfg_get_status = wlan_cfg_get_int(mac_ctx, WNI_CFG_VHT_ENABLE_TXBF_20MHZ, @@ -290,16 +280,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, session->nss = 1; } } - if (session->vhtCapabilityPresentInBeacon == 1 && - !session->htSupportedChannelWidthSet && - session->vht_config.su_beam_formee == 0) { - cfg_set_status = cfg_set_int(mac_ctx, - WNI_CFG_VHT_SU_BEAMFORMEE_CAP, - 0); - if (cfg_set_status != eSIR_SUCCESS) - lim_log(mac_ctx, LOGP, - FL("Set VHT_SU_BEAMFORMEE_CAP Fail")); - } + if (session->vhtCapability && session->vhtCapabilityPresentInBeacon && beacon_struct->ext_cap.present) { |