commit 5850f316de6236a8ad93ee1efed8204d86020717
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Tue Nov 27 19:00:25 2012 +0530
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 15:19:30 2012 -0800
tree cc27bc272a602467d753554214cbc9045aabd452
parent bf77107076c99d572d6738792da94b9e9fe3b724

wlan: Only flush non-P2P results from scan cache prior to LFR scan.

Currently, we flush the scan results from the scan cache prior to
LFR scans. This might unnecessarily purge P2P scan results and
might delay finding P2P clients in concurrency mode. This fix only
purges non-P2P clients prior to LFR scans.

Change-Id: I0ce26f7797257b237e5f1f7904d25f545d48800c
CR-Fixed: 423469

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 93ad78d..6092e1d 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2079,33 +2079,34 @@
     return ( csrLLScanPurgeResult(pMac, &pMac->scan.scanResultList) );
 }
 
-eHalStatus csrScanFlushP2PResult(tpAniSirGlobal pMac)
+eHalStatus csrScanFlushSelectiveResult(tpAniSirGlobal pMac, v_BOOL_t flushP2P)
 {
-        eHalStatus status = eHAL_STATUS_SUCCESS;
-        tListElem *pEntry,*pFreeElem;
-        tCsrScanResult *pBssDesc;
-        tDblLinkList *pList = &pMac->scan.scanResultList;
+    eHalStatus status = eHAL_STATUS_SUCCESS;
+    tListElem *pEntry,*pFreeElem;
+    tCsrScanResult *pBssDesc;
+    tDblLinkList *pList = &pMac->scan.scanResultList;
 
-        csrLLLock(pList);
+    csrLLLock(pList);
 
-        pEntry = csrLLPeekHead( pList, LL_ACCESS_NOLOCK );
-        while( pEntry != NULL)
+    pEntry = csrLLPeekHead( pList, LL_ACCESS_NOLOCK );
+    while( pEntry != NULL)
+    {
+        pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
+        if( flushP2P == vos_mem_compare( pBssDesc->Result.ssId.ssId, 
+                                         "DIRECT-", 7) )
         {
-                pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
-                if( vos_mem_compare( pBssDesc->Result.ssId.ssId, "DIRECT-", 7) )
-                {
-                        pFreeElem = pEntry;
-                        pEntry = csrLLNext(pList, pEntry, LL_ACCESS_NOLOCK);
-                        csrLLRemoveEntry(pList, pFreeElem, LL_ACCESS_NOLOCK);
-                        csrFreeScanResultEntry( pMac, pBssDesc );
-                        continue;
-                }
-                pEntry = csrLLNext(pList, pEntry, LL_ACCESS_NOLOCK);
+            pFreeElem = pEntry;
+            pEntry = csrLLNext(pList, pEntry, LL_ACCESS_NOLOCK);
+            csrLLRemoveEntry(pList, pFreeElem, LL_ACCESS_NOLOCK);
+            csrFreeScanResultEntry( pMac, pBssDesc );
+            continue;
         }
+        pEntry = csrLLNext(pList, pEntry, LL_ACCESS_NOLOCK);
+    }
 
-        csrLLUnlock(pList);
+    csrLLUnlock(pList);
 
-        return (status);
+    return (status);
 }
 
 /**