commit fc6ad8e5ed93f1b7c4ad28b9ac3a599e4070333c
author Peng Xu <pxu@qca.qualcomm.com> Thu Sep 25 13:16:43 2014 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Mon Sep 29 11:50:27 2014 +0530
tree 01130beabd67ccc3fc5251b98b349aabe0e3e0a0
parent 9f6566cc62e7816e2e1a764d10d3851071155c6a

sap: Add scan band preference in INI config

Add scan band preference parameter in INI config file to enable
scanning start from the preferred band during auto channel selection.

Change-Id: I678907ebc10787ba25ffdd193b7fb0040eebb3ec
CRs-fixed: 730791

CORE/SAP/src/sapChSelect.c

diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 1000597..3663652 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -1766,31 +1766,27 @@
     sapSortChlWeight(pSpectInfoParams);
 
 #ifdef SOFTAP_CHANNEL_RANGE
-    switch (pSapCtx->scanBandPreference)
+    if (eCSR_BAND_ALL == pSapCtx->scanBandPreference)
     {
-        case eCSR_BAND_ALL:
-            ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL, &startChannelNum);
-            ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL, &endChannelNum);
-            ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND, &operatingBand);
-            break;
-
-        case eCSR_BAND_24:
+        ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_START_CHANNEL, &startChannelNum);
+        ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_END_CHANNEL, &endChannelNum);
+        ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND, &operatingBand);
+    }
+    else
+    {
+        if (eCSR_BAND_24 == pSapCtx->currentPreferredBand)
+        {
             startChannelNum = rfChannels[RF_CHAN_1].channelNum;
             endChannelNum = rfChannels[RF_CHAN_14].channelNum;
             operatingBand = eSAP_RF_SUBBAND_2_4_GHZ;
-            break;
-
-        case eCSR_BAND_5G:
+        }
+        else
+        {
             startChannelNum = rfChannels[RF_CHAN_36].channelNum;
             endChannelNum = rfChannels[RF_CHAN_165].channelNum;
             operatingBand = RF_BAND_5_GHZ;
-            break;
-
-        default:
-            VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
-                      "%s : Invalid scanBandPreference value %d",
-                      __func__, pSapCtx->scanBandPreference);
-    }
+        }
+     }
 
     /*Loop till get the best channel in the given range */
     for(count=0; count < pSpectInfoParams->numSpectChans ; count++)