commit 658d4de99a25f1739f271ae86e9a3838643082c8
author Abhishek Singh <absingh@qti.qualcomm.com> Thu Jun 26 10:53:15 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Fri Jun 27 10:53:10 2014 -0700
tree 077fce1333aad2cb31dc5fa399668ad17c750d26
parent 7218fa225a4fbccc7edc8fda6771aa4fbddb48b5

wlan:pmf: Fix for incorrect pmf conditional compilation

one of the places in the code, we didn't add proper check
for 802.11W frames.

Change-Id: I93366dedc802be80fc5575a4319889494030cfc0
CRs-Fixed: 685801

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d4f8bf8..48cd4f5 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2129,6 +2129,7 @@
                     }
                     else
                     {
+#ifdef WLAN_FEATURE_11W
                         fMatch = csrIsSecurityMatch(pMac, &pFilter->authType,
                                                 &pFilter->EncryptionType,
                                                 &pFilter->mcEncryptionType,
@@ -2137,6 +2138,14 @@
                                                 &pFilter->MFPCapable,
                                                 &pBssDesc->Result.BssDescriptor,
                                                 pIes, NULL, NULL, NULL );
+#else
+                        fMatch = csrIsSecurityMatch(pMac, &pFilter->authType,
+                                                &pFilter->EncryptionType,
+                                                &pFilter->mcEncryptionType,
+                                                NULL, NULL, NULL,
+                                                &pBssDesc->Result.BssDescriptor,
+                                                pIes, NULL, NULL, NULL );
+#endif
                     }
                     if ((pBssDesc->Result.pvIes == NULL) && pIes)
                          vos_mem_free(pIes);

CORE/SME/src/csr/csrUtil.c

diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 7b8a3cb..f8dbb45 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -5673,6 +5673,7 @@
 #endif
         if ( !csrIsPhyModeMatch( pMac, pFilter->phyMode, pBssDesc, NULL, NULL, pIes ) ) break;
         if ( (!pFilter->bWPSAssociation) && (!pFilter->bOSENAssociation) &&
+#ifdef WLAN_FEATURE_11W
              !csrIsSecurityMatch( pMac, &pFilter->authType,
                                   &pFilter->EncryptionType,
                                   &pFilter->mcEncryptionType,
@@ -5680,7 +5681,16 @@
                                   &pFilter->MFPRequired,
                                   &pFilter->MFPCapable,
                                   pBssDesc, pIes, pNegAuth,
-                                  pNegUc, pNegMc ) ) break;
+                                  pNegUc, pNegMc )
+#else
+             !csrIsSecurityMatch( pMac, &pFilter->authType,
+                                  &pFilter->EncryptionType,
+                                  &pFilter->mcEncryptionType,
+                                  NULL, NULL, NULL,
+                                  pBssDesc, pIes, pNegAuth,
+                                  pNegUc, pNegMc )
+#endif
+                                                   ) break;
         if ( !csrIsCapabilitiesMatch( pMac, pFilter->BSSType, pBssDesc ) ) break;
         if ( !csrIsRateSetMatch( pMac, &pIes->SuppRates, &pIes->ExtSuppRates ) ) break;
         //Tush-QoS: validate first if asked for APSD or WMM association