commit 09dd66b0e584c349c0f85b5ab0b9a60972575b5a
author Gopichand Nakkala <gnakkala@qca.qualcomm.com> Mon Apr 01 17:13:01 2013 +0530
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Wed Apr 03 12:53:53 2013 -0700
tree dbb6da5d3552a1408e9a14b5625865619daca29a
parent 3b5158ad4feda09c6a1051aad9ef64b7641ae021

wlan:Not able to connect in 11r mode with CCX enabled.

AP is sending the CCX IE's even though the CCX is disabled
so condition to determine 11r or CCX connection is now limited
to the Open System authentication.If the authentication type is
FT_PSK or FT_RSN_PSK then connection type will be 11r.

Change-Id: I615805ab21f560d94fb0f7b6e8dc40dd0ef53c79
CRs-Fixed: 469631

CORE/SME/src/csr/csrApiRoam.c

diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index d19657f..b465002 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -11922,7 +11922,8 @@
         pProfile->MDID.mdiePresent = pBssDescription->mdiePresent;
         if (csrIsProfile11r( pProfile )
 #ifdef FEATURE_WLAN_CCX
-           && !((pIes->CCXVersion.present) && (pMac->roam.configParam.isCcxIniFeatureEnabled))
+           && !((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) &&
+                (pIes->CCXVersion.present) && (pMac->roam.configParam.isCcxIniFeatureEnabled))
 #endif
         )
         {