summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHema Aparna Medicharla <haparna@qti.qualcomm.com>2014-03-30 14:41:22 -0700
committerAkash Patel <c_akashp@qca.qualcomm.com>2014-04-17 16:45:58 -0700
commitdeb0e722af0b80a69e8f8c8eaebd4253273e7572 (patch)
tree5447918d719f641aefcd578b17e18b514b584eaf
parentbec0ce385022f62c768f16b3ea4c759a5951590e (diff)
wlan: rrm: Disable rrm in assoc request if AP doesnot support rrm
With the existing implementation, STA Cannot connect to some APs due to rrm set in th eassociation request when AP does not support rrm. Changes are made to disable the rrm in association request if rrm is not set in beacon/probe response from the AP. Change-Id: Id29caa9f63ea25634187381575e5dd65cb6a6702 CRs-fixed: 590602
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c7
-rw-r--r--CORE/MAC/src/pe/lim/limUtils.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index e632b88b3674..11029b825c80 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -719,6 +719,13 @@ limProcessMlmAuthCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK);
}
+ /* Clear rrm bit if AP doesn't support it */
+ if(!(psessionEntry->pLimJoinReq->bssDescription.capabilityInfo
+ & LIM_RRM_BIT_MASK))
+ {
+ caps &= (~LIM_RRM_BIT_MASK);
+ }
+
pMlmAssocReq->capabilityInfo = caps;
PELOG3(limLog(pMac, LOG3,
FL("Capabilities to be used in AssocReq=0x%X, privacy bit=%x shortSlotTime %x"),
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index 55892de81731..99057f85cde6 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -54,6 +54,7 @@ typedef enum
#define LIM_STA_ID_MASK 0x00FF
#define LIM_AID_MASK 0xC000
#define LIM_SPECTRUM_MANAGEMENT_BIT_MASK 0x0100
+#define LIM_RRM_BIT_MASK 0x1000
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
#define LIM_MAX_REASSOC_RETRY_LIMIT 2
#endif