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/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index af8ca73..6fb0e31 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -699,6 +699,13 @@
                  CFG_REST_TIME_CONC_DEFAULT, 
                  CFG_REST_TIME_CONC_MIN, 
                  CFG_REST_TIME_CONC_MAX ),
+
+   REG_VARIABLE( CFG_NUM_CHAN_COMBINED_CONC_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, nNumChanCombinedConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NUM_CHAN_COMBINED_CONC_DEFAULT,
+                 CFG_NUM_CHAN_COMBINED_CONC_MIN,
+                 CFG_NUM_CHAN_COMBINED_CONC_MAX ),
 #endif
    
    REG_VARIABLE( CFG_MAX_PS_POLL_NAME, WLAN_PARAM_Integer,
@@ -3254,6 +3261,7 @@
    smeConfig.csrConfig.nPassiveMaxChnTimeConc   = pConfig->nPassiveMaxChnTimeConc;
    smeConfig.csrConfig.nPassiveMinChnTimeConc   = pConfig->nPassiveMinChnTimeConc;
    smeConfig.csrConfig.nRestTimeConc            = pConfig->nRestTimeConc;
+   smeConfig.csrConfig.nNumChanCombinedConc     = pConfig->nNumChanCombinedConc;
 #endif
    smeConfig.csrConfig.Is11eSupportEnabled      = pConfig->b80211eIsEnabled;
    smeConfig.csrConfig.WMMSupportMode           = pConfig->WmmMode;