summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhishek Singh <absingh@qti.qualcomm.com>2015-06-19 12:59:15 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-06-29 07:23:37 -0700
commit2fc49188bb44c68098e12b8ed2a10c0a595d1163 (patch)
tree1d08a80752802de954367cb8d1b1f24c4f33a391
parent3e632b8d3368b86400f78c8b9f58b93759f53d5f (diff)
qcacld-2.0: Do not send 11w capability if FEATURE 11W is disabled.
prima to qcacld-2.0 propagation Even if FEATURE 11W is disabled in driver and supplicant set the 11w capability in RSN capability, 11w capability is set in assoc req. If FEATURE 11W is disabled, set 11w not supported in RSN IE. CRs-Fixed: 856406 Change-Id: Ib785ba175783eaa473dc360d7b2a75401f62e851
-rw-r--r--CORE/SME/src/csr/csrUtil.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 78dda71a946d..41a3bb8514ea 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -2929,8 +2929,13 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs
Capabilities->NoPairwise = (pRSNIe->RSN_Cap[0] >> 1) & 0x1 ; // Bit 1 No Pairwise
Capabilities->PTKSAReplayCounter = (pRSNIe->RSN_Cap[0] >> 2) & 0x3 ; // Bit 2, 3 PTKSA Replay Counter
Capabilities->GTKSAReplayCounter = (pRSNIe->RSN_Cap[0] >> 4) & 0x3 ; // Bit 4, 5 GTKSA Replay Counter
+#ifdef WLAN_FEATURE_11W
Capabilities->MFPRequired = (pRSNIe->RSN_Cap[0] >> 6) & 0x1 ; // Bit 6 MFPR
Capabilities->MFPCapable = (pRSNIe->RSN_Cap[0] >> 7) & 0x1 ; // Bit 7 MFPC
+#else
+ Capabilities->MFPRequired = 0 ; // Bit 6 MFPR
+ Capabilities->MFPCapable = 0 ; // Bit 7 MFPC
+#endif
Capabilities->Reserved = pRSNIe->RSN_Cap[1] & 0xff ; // remaining reserved
}
}