wlan: Modify the split scan logic to scan more than one channel at a
time

Modify the split scan logic to split the full scan into operations which
scan more than one channel at a time. The number of channels that are
scanned in each of the individual scan operations is configurable
through the gNumChanCombinedConc parameter from the cfg.ini file. The
default value of gNumChanCombinedConc is currently set to 1.

Change-Id: Ie5b39dcde3a6cae293cfb9350ae9102a61a84a63
CR-Fixed: 429425
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index ac644ef..f56bfdd 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -939,6 +939,7 @@
     pMac->roam.configParam.nPassiveMaxChnTimeConc = CSR_PASSIVE_MAX_CHANNEL_TIME_CONC;
     pMac->roam.configParam.nPassiveMinChnTimeConc = CSR_PASSIVE_MIN_CHANNEL_TIME_CONC;
     pMac->roam.configParam.nRestTimeConc = CSR_REST_TIME_CONC;
+    pMac->roam.configParam.nNumChanCombinedConc = CSR_NUM_CHAN_COMBINED_CONC;
 #endif
     pMac->roam.configParam.IsIdleScanEnabled = TRUE; //enable the idle scan by default
     pMac->roam.configParam.nTxPowerCap = CSR_MAX_TX_POWER;
@@ -1206,6 +1207,10 @@
         {
             pMac->roam.configParam.nRestTimeConc = pParam->nRestTimeConc;
         }
+        if(pParam->nNumChanCombinedConc)
+        {
+            pMac->roam.configParam.nNumChanCombinedConc = pParam->nNumChanCombinedConc;
+        }
 #endif
         //if upper layer wants to disable idle scan altogether set it to 0
         if(pParam->impsSleepTime)
@@ -1384,6 +1389,7 @@
         pParam->nPassiveMaxChnTimeConc = pMac->roam.configParam.nPassiveMaxChnTimeConc;
         pParam->nPassiveMinChnTimeConc = pMac->roam.configParam.nPassiveMinChnTimeConc;
         pParam->nRestTimeConc = pMac->roam.configParam.nRestTimeConc;
+        pParam->nNumChanCombinedConc = pMac->roam.configParam.nNumChanCombinedConc;
 #endif
         //Change the unit from microsecond to second
         pParam->impsSleepTime = pMac->roam.configParam.impsSleepTime / PAL_TIMER_TO_SEC_UNIT;