summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHu Wang <huw@codeaurora.org>2016-10-25 16:38:50 +0800
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-11-01 15:02:13 +0530
commit4ab37f21df053704e3a2fd4f2fb83beeba8bcd55 (patch)
treed507f8bbe6f34fbbc7486c7ca8bd8fb65e1ba88b
parent741f9b67dfad032c677d731a24b99a88c5c88d68 (diff)
Revert "qcacld-2.0: Set RM capability independent of AP's capability"
This reverts commit I6047d4dec19e7cd32d6733e4da773875bbbb31aa "qcacld-2.0: Set RM capability independent of AP's capability". This change is causing IoT issue with AP doesn't support 11k. Also this change was already reverted as part of commit I4e521dbdbdd5b083360405f26913278788c86555, however the revert was not complete. Apply a clean revert for updating Capability Info field. Change-Id: I6ba3f9121e297c2433612859ab2bd5e2c05e17b3 CRs-Fixed: 1081890
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index cfe751db001a..8b7f84b0ad20 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -573,11 +573,11 @@ limSendMlmAssocReq( tpAniSirGlobal pMac,
caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
}
- /*
- * RM capability should be independent of AP's capabilities
- * Refer 8.4.1.4 Capability Information field in 802.11-2012
- * Do not modify it.
- */
+ /* Clear rrm bit if AP doesn't support it */
+ if(!(psessionEntry->pLimJoinReq->bssDescription.capabilityInfo &
+ LIM_RRM_BIT_MASK)) {
+ caps &= (~LIM_RRM_BIT_MASK);
+ }
/* Clear short preamble bit if AP does not support it */
if(!(psessionEntry->pLimJoinReq->bssDescription.capabilityInfo &