qcacld-3.0: Remove RRM ie in Assoc Req based on AP capability

RRM ie should not be present in association req if AP doesn't
support 11k. As a part of fix add the check to append RMM ie only
if AP support 11k.

Change-Id: I4e521dbdbdd5b083360405f26913278788c86555
CRs-Fixed: 961737
This commit is contained in:
Gupta, Kapil
2016-01-13 19:34:02 +05:30
committed by Akash Patel
szülő f051ee490b
commit 99722fb229

Fájl megtekintése

@@ -1725,7 +1725,8 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
pe_session);
#if defined WLAN_FEATURE_VOWIFI
if (mac_ctx->rrm.rrmPEContext.rrmEnable)
if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps))
populate_dot11f_rrm_ie(mac_ctx, &frm->RRMEnabledCap,
pe_session);
#endif
@@ -2103,7 +2104,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
pe_session);
#if defined WLAN_FEATURE_VOWIFI
if (mac_ctx->rrm.rrmPEContext.rrmEnable)
if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps))
populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session);
#endif
@@ -2574,7 +2576,8 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
&frm.ExtSuppRates, psessionEntry);
#if defined WLAN_FEATURE_VOWIFI
if (pMac->rrm.rrmPEContext.rrmEnable)
if (pMac->rrm.rrmPEContext.rrmEnable &&
SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps))
populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry);
#endif
/* The join request *should* contain zero or one of the WPA and RSN */