wlan: Increase number of buckets to categorize roamable APs

Roamable candidates found after scanning are categorized into buckets
based on their respective RSSI. Currently, width of each bucket is
defaulted to 30 and the number of buckets is set to 5. Due to this, all
roam candidates within -60 to -90 dBm fall into a single bucket. Roam
candidates from the same bucket are then sorted based on their
capabilities. Hence, it is possible that we might pick an AP with -89
dBm ahead of another candidate AP with -61 dBm.This problem is fixed by
increasing the number of buckets and reducing the width between the
buckets. This check-in brings in support for a width of 5 dBm
(configurable through ini parameter gRssiCatGap) and increases the
number of buckets to 15.

Change-Id: I8f3778fcb57024ea5837ed1e5628cc442337e4f3
CR-Fixed: Google CR 7329568
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index e681718..39116d3 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -329,7 +329,7 @@
 #define CFG_SCAN_RESULT_AGE_TIME_CPS_DEFAULT   ( 600 )
 
 #define CFG_RSSI_CATEGORY_GAP_NAME             "gRssiCatGap"
-#define CFG_RSSI_CATEGORY_GAP_MIN              ( 10 )  
+#define CFG_RSSI_CATEGORY_GAP_MIN              ( 5 )  
 #define CFG_RSSI_CATEGORY_GAP_MAX              ( 100 )  
 #define CFG_RSSI_CATEGORY_GAP_DEFAULT          ( 30 )
 
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index a257881..2708398 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -59,7 +59,7 @@
 #define CSR_SCAN_RETURN_AFTER_5_BAND_11d_FOUND      ( 0x80 )
 #define CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND     ( 0x40 )
 #define CSR_SCAN_RETURN_AFTER_EITHER_BAND_11d_FOUND ( CSR_SCAN_RETURN_AFTER_5_BAND_11d_FOUND | CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND )
-#define CSR_NUM_RSSI_CAT        5
+#define CSR_NUM_RSSI_CAT        15
 #define CSR_MAX_STATISTICS_REQ        10
 
 //Support for multiple session
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index 1572b2a..c0e6cef 100644
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -177,6 +177,10 @@
 #the RSSI of the new/roamable AP should be for roaming
 RoamRssiDiff=0
 
+#Configure the RSSI gap that will be used to partition/categorize width of 
+#each  individual category (aka bucket).
+gRssiCatGap=10
+
 # SAP Country code
 
 # Default Country Code is 2 bytes, 3rd byte is optional indoor or out door.