merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index a03252d..9790063 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -44,8 +44,8 @@
 InfraUapsdBeSrvIntv=0
 InfraUapsdBkSrvIntv=0
 
-# Enable Firmware RSSI monitoring for roaming
-gEnableFWRssiMonitoring=1
+# Disable RSSI FW filtering
+gEnableFWRssiMonitoring=0
 
 # Make 1x1 the default antenna configuration
 gNumRxAnt=1
@@ -103,30 +103,19 @@
 
 # CCX Support and fast transition
 CcxEnabled=0
-FastTransitionEnabled=1
+FastTransitionEnabled=0
 ImplicitQosIsEnabled=1
 gNeighborScanTimerPeriod=200
 
-gNeighborLookupThreshold=76
-gNeighborReassocThreshold=81
+gNeighborLookupThreshold=82
+gNeighborReassocThreshold=88
 
 gNeighborScanChannelMinTime=20
 gNeighborScanChannelMaxTime=30
 gMaxNeighborReqTries=3
 
-# Legacy (non-CCX, non-802.11r) Fast Roaming Support
-# To enable, set FastRoamEnabled=1, gEnableFWRssiMonitoring=1, FastTransitionEnabled=1
-# To disable, set FastRoamEnabled=0, gEnableFWRssiMonitoring=0, FastTransitionEnabled=0
-FastRoamEnabled=1
-
-#Check if the AP to which we are roaming is better than current AP in terms of RSSI.
-#Checking is disabled if set to Zero.Otherwise it will use this value as to how better
-#the RSSI of the new/roamable AP should be for roaming
-RoamRssiDiff=3
-
-#Configure the RSSI gap that will be used to partition/categorize width of
-#each  individual category (aka bucket).
-gRssiCatGap=5
+FastRoamEnabled=0
+RoamRssiDiff=0
 
 # SAP Country code
 # Default Country Code is 2 bytes, 3rd byte is optional indoor or out door.