commit 798d6f2548d075e0b155bd6b4a9d4f8d3ab4491b
author Sandeep Puligilla <spuligil@qti.qualcomm.com> Thu Apr 24 23:30:36 2014 +0530
committer Anjanee Devi Kapparapu <c_akappa@codeaurora.org> Tue Apr 29 14:31:07 2014 +0530
tree d4d8f17b847a6df17d8fadc5370f89e795dcc87e
parent 60de76dd6114fd415a4106c5ffb15bceef7bd91a

wlan: Disable CCX for WPA2-Enterprise (802.1X) or WPA2-PSK

Currently our CCX-enabled driver configures an assocaition as CCX
if it is made with a CCX-capable AP.  This change insures that we only
configure for CCX if the supplicant indicates an AKM of CCKM. (Or
if the association is "open" with a "CCX capable" AP.)

Change-Id: I3139c2e48a00f6a0387845c823d4153da3b3aaa0
CRs-Fixed: 651515

CORE/SME/src/csr/csrApiRoam.c

diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 33565fe..8e094f7 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -7194,14 +7194,7 @@
 #ifdef FEATURE_WLAN_ESE
     if ((csrIsProfileESE(pProfile) ||
          ((pIesTemp->ESEVersion.present)
-          && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK) 
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN) 
-#ifdef WLAN_FEATURE_11W
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
-#endif
-              || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
+          && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM))))
         && (pMac->roam.configParam.isEseIniFeatureEnabled))
     {
         pConnectProfile->isESEAssoc = 1;
@@ -12968,14 +12961,7 @@
          */
         if ((csrIsProfileESE(pProfile) ||
                   ((pIes->ESEVersion.present)
-                   && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
-                       || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
-                       || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
-                       || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN)
-#ifdef WLAN_FEATURE_11W
-                       || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
-#endif
-                       || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
+                   && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM))))
                  && (pMac->roam.configParam.isEseIniFeatureEnabled))
         {
             // isESEconnection;
@@ -13004,14 +12990,7 @@
         {
         if ((csrIsProfileESE(pProfile) ||
              ((pIes->ESEVersion.present)
-              && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
-                  || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
-                  || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
-                  || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN)
-#ifdef WLAN_FEATURE_11W
-                  || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
-#endif
-                  || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
+              && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM))))
             && (pMac->roam.configParam.isEseIniFeatureEnabled))
         {
            tESETspecInfo eseTspec;