commit d6713584b10f25f08934c57f9d7b52c31e612164
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Fri Nov 09 16:56:56 2012 -0800
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 15:13:05 2012 -0800
tree 8a24c1862bf2da84b4d76e0ece79530dc5d00cd9
parent 86f629e83e4c16df5151738766a0acde0155a6e0

wlan: Modify the split scan logic to query active connected session state before every scan command

The current implementation of split scan logic splits the scan commands
to perform scans on individual channels if there active connected
sessions present. It does not handle the case where a sessions have
transitioned from connected to disconnected state during the split scan
operation. This cause the device to continue to split the scan commands
even though there are no active connected sessions leading to longer
scan completion times. The change modifies the split scan logic to query
the connected state of the sessions before initiating every scan split
operation. If there are no connected sessions present then it continues
to perform the scan operation on all the specified channels in one
single sweep instead of breaking them up. The change also modifies the
triggering of the timer to initiate the next scan command immediately if
there are no connected sessions present.

Change-Id: I8747c03927224fb9f1d1713b5f94cb34a2fd7777
CR-Fixed: 415261

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d2d6f77..c191a4f 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -4440,9 +4440,17 @@
 #ifdef WLAN_AP_STA_CONCURRENCY
     if (!csrLLIsListEmpty( &pMac->scan.scanCmdPendingList, LL_ACCESS_LOCK ))
     {
-         VOS_ASSERT(pCommand->u.scanCmd.u.scanRequest.restTime != 0);
-         palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer, 
-                 pCommand->u.scanCmd.u.scanRequest.restTime * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
+        if (eANI_BOOLEAN_TRUE == csrIsAnySessionConnected(pMac)) {
+            /* if active connected sessions present then continue to split scan
+             * with specified interval between consecutive scans */
+            csrSetDefaultScanTiming(pMac, pCommand->u.scanCmd.u.scanRequest.scanType, &(pCommand->u.scanCmd.u.scanRequest));
+            palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer,
+                pCommand->u.scanCmd.u.scanRequest.restTime * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
+        } else {
+            /* if no connected sessions present then initiate next scan command immediately */
+            /* minimum timer granularity is 10ms */
+            palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer, 10 * 1000, eANI_BOOLEAN_FALSE);
+        }
     }
 #endif
     return (fRet);
@@ -5501,7 +5509,12 @@
        
         pScanCmd = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
         numChn = pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels;
-        if (numChn > 1)
+
+        /* if any session is connected and the number of channels to scan is
+         * greater than 1 then split the scan into multiple scan operations
+         * on each individual channel else continue to perform scan on all
+         * specified channels */
+        if ( (eANI_BOOLEAN_TRUE == csrIsAnySessionConnected(pMac)) && (numChn > 1) )
         {
              palZeroMemory(pMac->hHdd, &scanReq, sizeof(tCsrScanRequest));
 
@@ -5552,8 +5565,9 @@
              }       
         }
         else
-        {    //numChn ==1 This is the last channel to be scanned
-             //last channel remaining to scan
+        {
+             /* no active connected session present or numChn == 1
+              * scan all remaining channels */
              pSendScanCmd = pScanCmd;
              //remove this command from pending list 
              if (csrLLRemoveHead( &pMac->scan.scanCmdPendingList, LL_ACCESS_NOLOCK) == NULL)