Fix WLAN connection issues with BTC

Increase the channel scan dwell time min/max values whenever BTC
events indicates to compromise on scan time while BT and WLAN does
the time sharing. This improves the WLAN scan results and connection
time.

Change-Id: I20db6a011c6ce6e0fd6b4171ddfa16c1b74d4613
CRs-Fixed: 360804
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index e2b90ae..9088b7f 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -559,6 +559,16 @@
 #define CFG_ACTIVE_MIN_CHANNEL_TIME_MAX        ( 10000 )
 #define CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT    ( 20 )
 
+#define CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_NAME       "gActiveMaxChannelTimeBtc"
+#define CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_MIN        ( 0 )
+#define CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_MAX        ( 10000 )
+#define CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_DEFAULT    ( 120 )
+
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_NAME       "gActiveMinChannelTimeBtc"
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_MIN        ( 0 )
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_MAX        ( 10000 )
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_DEFAULT    ( 60 )
+
 #ifdef WLAN_AP_STA_CONCURRENCY
 
 #define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_NAME      "gPassiveMaxChannelTimeConc"
@@ -1790,6 +1800,8 @@
    v_U32_t        nActiveMinChnTime;     //in units of milliseconds
    v_U32_t        nActiveMaxChnTime;     //in units of milliseconds
 
+   v_U32_t        nActiveMinChnTimeBtc;     //in units of milliseconds
+   v_U32_t        nActiveMaxChnTimeBtc;     //in units of milliseconds
 #ifdef WLAN_AP_STA_CONCURRENCY
    v_U32_t        nPassiveMinChnTimeConc;    //in units of milliseconds
    v_U32_t        nPassiveMaxChnTimeConc;    //in units of milliseconds
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 21d041f..243d61c 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -39,21 +39,21 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/**========================================================================= 
+/**=========================================================================
 
-                       EDIT HISTORY FOR FILE 
-   
-   
-  This section contains comments describing changes made to the module. 
-  Notice that changes are listed in reverse chronological order. 
-   
-   
-  $Header:$   $DateTime: $ $Author: $ 
-   
-   
-  when        who    what, where, why 
+                       EDIT HISTORY FOR FILE
+
+
+  This section contains comments describing changes made to the module.
+  Notice that changes are listed in reverse chronological order.
+
+
+  $Header:$   $DateTime: $ $Author: $
+
+
+  when        who    what, where, why
   --------    ---    --------------------------------------------------------
-  07/27/09    kanand Created module. 
+  07/27/09    kanand Created module.
 
   ==========================================================================*/
 
@@ -143,396 +143,396 @@
 REG_TABLE_ENTRY g_registry_table[] =
 {
    REG_VARIABLE( CFG_RTS_THRESHOLD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, RTSThreshold, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RTS_THRESHOLD_DEFAULT, 
-                 CFG_RTS_THRESHOLD_MIN, 
-                 CFG_RTS_THRESHOLD_MAX ), 
+                 hdd_config_t, RTSThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RTS_THRESHOLD_DEFAULT,
+                 CFG_RTS_THRESHOLD_MIN,
+                 CFG_RTS_THRESHOLD_MAX ),
 
    REG_VARIABLE( CFG_FRAG_THRESHOLD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, FragmentationThreshold, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_FRAG_THRESHOLD_DEFAULT, 
-                 CFG_FRAG_THRESHOLD_MIN, 
-                 CFG_FRAG_THRESHOLD_MAX ),              
+                 hdd_config_t, FragmentationThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_FRAG_THRESHOLD_DEFAULT,
+                 CFG_FRAG_THRESHOLD_MIN,
+                 CFG_FRAG_THRESHOLD_MAX ),
 
    REG_VARIABLE( CFG_CALIBRATION_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, Calibration, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_CALIBRATION_DEFAULT, 
-                 CFG_CALIBRATION_MIN, 
+                 hdd_config_t, Calibration,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_CALIBRATION_DEFAULT,
+                 CFG_CALIBRATION_MIN,
                  CFG_CALIBRATION_MAX ),
-                
+
    REG_VARIABLE( CFG_CALIBRATION_PERIOD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, CalibrationPeriod, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_CALIBRATION_PERIOD_DEFAULT, 
-                 CFG_CALIBRATION_PERIOD_MIN, 
-                 CFG_CALIBRATION_PERIOD_MAX ), 
+                 hdd_config_t, CalibrationPeriod,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_CALIBRATION_PERIOD_DEFAULT,
+                 CFG_CALIBRATION_PERIOD_MIN,
+                 CFG_CALIBRATION_PERIOD_MAX ),
 
    REG_VARIABLE( CFG_OPERATING_CHANNEL_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, OperatingChannel,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_OPERATING_CHANNEL_DEFAULT, 
-                 CFG_OPERATING_CHANNEL_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_OPERATING_CHANNEL_DEFAULT,
+                 CFG_OPERATING_CHANNEL_MIN,
                  CFG_OPERATING_CHANNEL_MAX ),
 
    REG_VARIABLE( CFG_SHORT_SLOT_TIME_ENABLED_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, ShortSlotTimeEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SHORT_SLOT_TIME_ENABLED_DEFAULT, 
-                 CFG_SHORT_SLOT_TIME_ENABLED_MIN, 
+                 hdd_config_t, ShortSlotTimeEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SHORT_SLOT_TIME_ENABLED_DEFAULT,
+                 CFG_SHORT_SLOT_TIME_ENABLED_MIN,
                  CFG_SHORT_SLOT_TIME_ENABLED_MAX ),
 
    REG_VARIABLE( CFG_11D_SUPPORT_ENABLED_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, Is11dSupportEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_11D_SUPPORT_ENABLED_DEFAULT, 
-                 CFG_11D_SUPPORT_ENABLED_MIN, 
+                 hdd_config_t, Is11dSupportEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_11D_SUPPORT_ENABLED_DEFAULT,
+                 CFG_11D_SUPPORT_ENABLED_MIN,
                  CFG_11D_SUPPORT_ENABLED_MAX ),
-   
+
    REG_VARIABLE( CFG_11H_SUPPORT_ENABLED_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, Is11hSupportEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_11H_SUPPORT_ENABLED_DEFAULT, 
-                 CFG_11H_SUPPORT_ENABLED_MIN, 
+                 hdd_config_t, Is11hSupportEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_11H_SUPPORT_ENABLED_DEFAULT,
+                 CFG_11H_SUPPORT_ENABLED_MIN,
                  CFG_11H_SUPPORT_ENABLED_MAX ),
 
    REG_VARIABLE( CFG_ENFORCE_11D_CHANNELS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fEnforce11dChannels, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_ENFORCE_11D_CHANNELS_DEFAULT, 
-                 CFG_ENFORCE_11D_CHANNELS_MIN, 
+                 hdd_config_t, fEnforce11dChannels,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_ENFORCE_11D_CHANNELS_DEFAULT,
+                 CFG_ENFORCE_11D_CHANNELS_MIN,
                  CFG_ENFORCE_11D_CHANNELS_MAX ),
 
    REG_VARIABLE( CFG_COUNTRY_CODE_PRIORITY_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fSupplicantCountryCodeHasPriority, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_COUNTRY_CODE_PRIORITY_DEFAULT, 
-                 CFG_COUNTRY_CODE_PRIORITY_MIN, 
+                 hdd_config_t, fSupplicantCountryCodeHasPriority,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_COUNTRY_CODE_PRIORITY_DEFAULT,
+                 CFG_COUNTRY_CODE_PRIORITY_MIN,
                  CFG_COUNTRY_CODE_PRIORITY_MAX),
 
    REG_VARIABLE( CFG_ENFORCE_COUNTRY_CODE_MATCH_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fEnforceCountryCodeMatch, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_ENFORCE_COUNTRY_CODE_MATCH_DEFAULT, 
-                 CFG_ENFORCE_COUNTRY_CODE_MATCH_MIN, 
+                 hdd_config_t, fEnforceCountryCodeMatch,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_ENFORCE_COUNTRY_CODE_MATCH_DEFAULT,
+                 CFG_ENFORCE_COUNTRY_CODE_MATCH_MIN,
                  CFG_ENFORCE_COUNTRY_CODE_MATCH_MAX ),
 
    REG_VARIABLE( CFG_ENFORCE_DEFAULT_DOMAIN_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fEnforceDefaultDomain, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_ENFORCE_DEFAULT_DOMAIN_DEFAULT, 
-                 CFG_ENFORCE_DEFAULT_DOMAIN_MIN, 
+                 hdd_config_t, fEnforceDefaultDomain,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_ENFORCE_DEFAULT_DOMAIN_DEFAULT,
+                 CFG_ENFORCE_DEFAULT_DOMAIN_MIN,
                  CFG_ENFORCE_DEFAULT_DOMAIN_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_ID1_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg1Id,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_ID1_DEFAULT, 
-                 CFG_GENERIC_ID1_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_ID1_DEFAULT,
+                 CFG_GENERIC_ID1_MIN,
                  CFG_GENERIC_ID1_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_ID2_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg2Id,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_ID2_DEFAULT, 
-                 CFG_GENERIC_ID2_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_ID2_DEFAULT,
+                 CFG_GENERIC_ID2_MIN,
                  CFG_GENERIC_ID2_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_ID3_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg3Id,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_ID3_DEFAULT, 
-                 CFG_GENERIC_ID3_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_ID3_DEFAULT,
+                 CFG_GENERIC_ID3_MIN,
                  CFG_GENERIC_ID3_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_ID4_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg4Id,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_ID4_DEFAULT, 
-                 CFG_GENERIC_ID4_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_ID4_DEFAULT,
+                 CFG_GENERIC_ID4_MIN,
                  CFG_GENERIC_ID4_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_ID5_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg5Id,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_ID5_DEFAULT, 
-                 CFG_GENERIC_ID5_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_ID5_DEFAULT,
+                 CFG_GENERIC_ID5_MIN,
                  CFG_GENERIC_ID5_MAX ),
 
    REG_VARIABLE( CFG_GENERIC_VALUE1_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg1Value,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_VALUE1_DEFAULT, 
-                 CFG_GENERIC_VALUE1_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_VALUE1_DEFAULT,
+                 CFG_GENERIC_VALUE1_MIN,
                  CFG_GENERIC_VALUE1_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_VALUE2_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg2Value,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_VALUE2_DEFAULT, 
-                 CFG_GENERIC_VALUE2_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_VALUE2_DEFAULT,
+                 CFG_GENERIC_VALUE2_MIN,
                  CFG_GENERIC_VALUE2_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_VALUE3_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg3Value,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_VALUE3_DEFAULT, 
-                 CFG_GENERIC_VALUE3_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_VALUE3_DEFAULT,
+                 CFG_GENERIC_VALUE3_MIN,
                  CFG_GENERIC_VALUE3_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_VALUE4_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg4Value,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_VALUE4_DEFAULT, 
-                 CFG_GENERIC_VALUE4_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_VALUE4_DEFAULT,
+                 CFG_GENERIC_VALUE4_MIN,
                  CFG_GENERIC_VALUE4_MAX ),
-                
+
    REG_VARIABLE( CFG_GENERIC_VALUE5_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, Cfg5Value,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_GENERIC_VALUE5_DEFAULT, 
-                 CFG_GENERIC_VALUE5_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_GENERIC_VALUE5_DEFAULT,
+                 CFG_GENERIC_VALUE5_MIN,
                  CFG_GENERIC_VALUE5_MAX ),
 
    REG_VARIABLE( CFG_HEARTBEAT_THRESH_24_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, HeartbeatThresh24, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_HEARTBEAT_THRESH_24_DEFAULT, 
-                 CFG_HEARTBEAT_THRESH_24_MIN, 
+                 hdd_config_t, HeartbeatThresh24,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_HEARTBEAT_THRESH_24_DEFAULT,
+                 CFG_HEARTBEAT_THRESH_24_MIN,
                  CFG_HEARTBEAT_THRESH_24_MAX ),
-                
+
    REG_VARIABLE_STRING( CFG_POWER_USAGE_NAME, WLAN_PARAM_String,
-                        hdd_config_t, PowerUsageControl, 
+                        hdd_config_t, PowerUsageControl,
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_POWER_USAGE_DEFAULT ),
 
    REG_VARIABLE( CFG_ENABLE_SUSPEND_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nEnableSuspend, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_SUSPEND_DEFAULT, 
-                 CFG_ENABLE_SUSPEND_MIN, 
+                 hdd_config_t, nEnableSuspend,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_SUSPEND_DEFAULT,
+                 CFG_ENABLE_SUSPEND_MIN,
                  CFG_ENABLE_SUSPEND_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_ENABLE_DRIVER_STOP_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nEnableDriverStop, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_ENABLE_DRIVER_STOP_DEFAULT, 
-                 CFG_ENABLE_ENABLE_DRIVER_STOP_MIN, 
+                 hdd_config_t, nEnableDriverStop,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_ENABLE_DRIVER_STOP_DEFAULT,
+                 CFG_ENABLE_ENABLE_DRIVER_STOP_MIN,
                  CFG_ENABLE_ENABLE_DRIVER_STOP_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_IMPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsImpsEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_IMPS_DEFAULT, 
-                 CFG_ENABLE_IMPS_MIN, 
+                 hdd_config_t, fIsImpsEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_IMPS_DEFAULT,
+                 CFG_ENABLE_IMPS_MIN,
                  CFG_ENABLE_IMPS_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_LOGP_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsLogpEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_LOGP_DEFAULT, 
-                 CFG_ENABLE_LOGP_MIN, 
+                 hdd_config_t, fIsLogpEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_LOGP_DEFAULT,
+                 CFG_ENABLE_LOGP_MIN,
                  CFG_ENABLE_LOGP_MAX ),
 
    REG_VARIABLE( CFG_IMPS_MINIMUM_SLEEP_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nImpsMinSleepTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_IMPS_MINIMUM_SLEEP_TIME_DEFAULT, 
-                 CFG_IMPS_MINIMUM_SLEEP_TIME_MIN, 
+                 hdd_config_t, nImpsMinSleepTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_IMPS_MINIMUM_SLEEP_TIME_DEFAULT,
+                 CFG_IMPS_MINIMUM_SLEEP_TIME_MIN,
                  CFG_IMPS_MINIMUM_SLEEP_TIME_MAX ),
 
    REG_VARIABLE( CFG_IMPS_MAXIMUM_SLEEP_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nImpsMaxSleepTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_IMPS_MAXIMUM_SLEEP_TIME_DEFAULT, 
-                 CFG_IMPS_MAXIMUM_SLEEP_TIME_MIN, 
+                 hdd_config_t, nImpsMaxSleepTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_IMPS_MAXIMUM_SLEEP_TIME_DEFAULT,
+                 CFG_IMPS_MAXIMUM_SLEEP_TIME_MIN,
                  CFG_IMPS_MAXIMUM_SLEEP_TIME_MAX ),
 
    REG_VARIABLE( CFG_IMPS_MODERATE_SLEEP_TIME_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, nImpsModSleepTime,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_IMPS_MODERATE_SLEEP_TIME_DEFAULT, 
-                 CFG_IMPS_MODERATE_SLEEP_TIME_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_IMPS_MODERATE_SLEEP_TIME_DEFAULT,
+                 CFG_IMPS_MODERATE_SLEEP_TIME_MIN,
                  CFG_IMPS_MODERATE_SLEEP_TIME_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_BMPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsBmpsEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_BMPS_DEFAULT, 
-                 CFG_ENABLE_BMPS_MIN, 
+                 hdd_config_t, fIsBmpsEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_BMPS_DEFAULT,
+                 CFG_ENABLE_BMPS_MIN,
                  CFG_ENABLE_BMPS_MAX ),
 
    REG_VARIABLE( CFG_BMPS_MINIMUM_LI_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nBmpsMinListenInterval, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_BMPS_MINIMUM_LI_DEFAULT, 
-                 CFG_BMPS_MINIMUM_LI_MIN, 
+                 hdd_config_t, nBmpsMinListenInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_BMPS_MINIMUM_LI_DEFAULT,
+                 CFG_BMPS_MINIMUM_LI_MIN,
                  CFG_BMPS_MINIMUM_LI_MAX ),
 
    REG_VARIABLE( CFG_BMPS_MAXIMUM_LI_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nBmpsMaxListenInterval, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_BMPS_MAXIMUM_LI_DEFAULT, 
-                 CFG_BMPS_MAXIMUM_LI_MIN, 
+                 hdd_config_t, nBmpsMaxListenInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_BMPS_MAXIMUM_LI_DEFAULT,
+                 CFG_BMPS_MAXIMUM_LI_MIN,
                  CFG_BMPS_MAXIMUM_LI_MAX ),
 
    REG_VARIABLE( CFG_BMPS_MODERATE_LI_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, nBmpsModListenInterval,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_BMPS_MODERATE_LI_DEFAULT, 
-                 CFG_BMPS_MODERATE_LI_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_BMPS_MODERATE_LI_DEFAULT,
+                 CFG_BMPS_MODERATE_LI_MIN,
                  CFG_BMPS_MODERATE_LI_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_AUTO_BMPS_TIMER_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsAutoBmpsTimerEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_AUTO_BMPS_TIMER_DEFAULT, 
-                 CFG_ENABLE_AUTO_BMPS_TIMER_MIN, 
+                 hdd_config_t, fIsAutoBmpsTimerEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_AUTO_BMPS_TIMER_DEFAULT,
+                 CFG_ENABLE_AUTO_BMPS_TIMER_MIN,
                  CFG_ENABLE_AUTO_BMPS_TIMER_MAX ),
 
    REG_VARIABLE( CFG_AUTO_BMPS_TIMER_VALUE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nAutoBmpsTimerValue, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_AUTO_BMPS_TIMER_VALUE_DEFAULT, 
-                 CFG_AUTO_BMPS_TIMER_VALUE_MIN, 
+                 hdd_config_t, nAutoBmpsTimerValue,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_AUTO_BMPS_TIMER_VALUE_DEFAULT,
+                 CFG_AUTO_BMPS_TIMER_VALUE_MIN,
                  CFG_AUTO_BMPS_TIMER_VALUE_MAX ),
 
    REG_VARIABLE( CFG_DOT11_MODE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, dot11Mode, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_DOT11_MODE_DEFAULT, 
-                 CFG_DOT11_MODE_MIN, 
+                 hdd_config_t, dot11Mode,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_DOT11_MODE_DEFAULT,
+                 CFG_DOT11_MODE_MIN,
                  CFG_DOT11_MODE_MAX ),
-                 
+
    REG_VARIABLE( CFG_CHANNEL_BONDING_MODE_24GHZ_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nChannelBondingMode24GHz, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_CHANNEL_BONDING_MODE_DEFAULT, 
-                 CFG_CHANNEL_BONDING_MODE_MIN, 
+                 hdd_config_t, nChannelBondingMode24GHz,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_CHANNEL_BONDING_MODE_DEFAULT,
+                 CFG_CHANNEL_BONDING_MODE_MIN,
                  CFG_CHANNEL_BONDING_MODE_MAX),
-              
+
    REG_VARIABLE( CFG_CHANNEL_BONDING_MODE_5GHZ_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nChannelBondingMode5GHz, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_CHANNEL_BONDING_MODE_DEFAULT, 
-                 CFG_CHANNEL_BONDING_MODE_MIN, 
+                 hdd_config_t, nChannelBondingMode5GHz,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_CHANNEL_BONDING_MODE_DEFAULT,
+                 CFG_CHANNEL_BONDING_MODE_MIN,
                  CFG_CHANNEL_BONDING_MODE_MAX),
-              
-   REG_VARIABLE( CFG_MAX_RX_AMPDU_FACTOR_NAME, WLAN_PARAM_Integer,   
-                 hdd_config_t, MaxRxAmpduFactor, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK , 
-                 CFG_MAX_RX_AMPDU_FACTOR_DEFAULT, 
-                 CFG_MAX_RX_AMPDU_FACTOR_MIN, 
+
+   REG_VARIABLE( CFG_MAX_RX_AMPDU_FACTOR_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, MaxRxAmpduFactor,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK ,
+                 CFG_MAX_RX_AMPDU_FACTOR_DEFAULT,
+                 CFG_MAX_RX_AMPDU_FACTOR_MIN,
                  CFG_MAX_RX_AMPDU_FACTOR_MAX),
-                
+
    REG_VARIABLE( CFG_FIXED_RATE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, TxRate, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_FIXED_RATE_DEFAULT, 
-                 CFG_FIXED_RATE_MIN, 
+                 hdd_config_t, TxRate,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_FIXED_RATE_DEFAULT,
+                 CFG_FIXED_RATE_MIN,
                  CFG_FIXED_RATE_MAX ),
 
    REG_VARIABLE( CFG_SHORT_GI_20MHZ_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, ShortGI20MhzEnable, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_SHORT_GI_20MHZ_DEFAULT, 
-                 CFG_SHORT_GI_20MHZ_MIN, 
+                 hdd_config_t, ShortGI20MhzEnable,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_SHORT_GI_20MHZ_DEFAULT,
+                 CFG_SHORT_GI_20MHZ_MIN,
                  CFG_SHORT_GI_20MHZ_MAX ),
 
    REG_VARIABLE( CFG_BLOCK_ACK_AUTO_SETUP_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, BlockAckAutoSetup, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_BLOCK_ACK_AUTO_SETUP_DEFAULT, 
-                 CFG_BLOCK_ACK_AUTO_SETUP_MIN, 
+                 hdd_config_t, BlockAckAutoSetup,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_BLOCK_ACK_AUTO_SETUP_DEFAULT,
+                 CFG_BLOCK_ACK_AUTO_SETUP_MIN,
                  CFG_BLOCK_ACK_AUTO_SETUP_MAX ),
-  
+
    REG_VARIABLE( CFG_SCAN_RESULT_AGE_COUNT_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, ScanResultAgeCount, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SCAN_RESULT_AGE_COUNT_DEFAULT, 
-                 CFG_SCAN_RESULT_AGE_COUNT_MIN, 
+                 hdd_config_t, ScanResultAgeCount,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SCAN_RESULT_AGE_COUNT_DEFAULT,
+                 CFG_SCAN_RESULT_AGE_COUNT_MIN,
                  CFG_SCAN_RESULT_AGE_COUNT_MAX ),
 
    REG_VARIABLE( CFG_SCAN_RESULT_AGE_TIME_NCNPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nScanAgeTimeNCNPS, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SCAN_RESULT_AGE_TIME_NCNPS_DEFAULT, 
-                 CFG_SCAN_RESULT_AGE_TIME_NCNPS_MIN, 
+                 hdd_config_t, nScanAgeTimeNCNPS,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SCAN_RESULT_AGE_TIME_NCNPS_DEFAULT,
+                 CFG_SCAN_RESULT_AGE_TIME_NCNPS_MIN,
                  CFG_SCAN_RESULT_AGE_TIME_NCNPS_MAX ),
 
    REG_VARIABLE( CFG_SCAN_RESULT_AGE_TIME_NCPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nScanAgeTimeNCPS, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SCAN_RESULT_AGE_TIME_NCPS_DEFAULT, 
-                 CFG_SCAN_RESULT_AGE_TIME_NCPS_MIN, 
+                 hdd_config_t, nScanAgeTimeNCPS,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SCAN_RESULT_AGE_TIME_NCPS_DEFAULT,
+                 CFG_SCAN_RESULT_AGE_TIME_NCPS_MIN,
                  CFG_SCAN_RESULT_AGE_TIME_NCPS_MAX ),
 
    REG_VARIABLE( CFG_SCAN_RESULT_AGE_TIME_CNPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nScanAgeTimeCNPS, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SCAN_RESULT_AGE_TIME_CNPS_DEFAULT, 
-                 CFG_SCAN_RESULT_AGE_TIME_CNPS_MIN, 
+                 hdd_config_t, nScanAgeTimeCNPS,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SCAN_RESULT_AGE_TIME_CNPS_DEFAULT,
+                 CFG_SCAN_RESULT_AGE_TIME_CNPS_MIN,
                  CFG_SCAN_RESULT_AGE_TIME_CNPS_MAX ),
 
    REG_VARIABLE( CFG_SCAN_RESULT_AGE_TIME_CPS_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nScanAgeTimeCPS, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_SCAN_RESULT_AGE_TIME_CPS_DEFAULT, 
-                 CFG_SCAN_RESULT_AGE_TIME_CPS_MIN, 
+                 hdd_config_t, nScanAgeTimeCPS,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_SCAN_RESULT_AGE_TIME_CPS_DEFAULT,
+                 CFG_SCAN_RESULT_AGE_TIME_CPS_MIN,
                  CFG_SCAN_RESULT_AGE_TIME_CPS_MAX ),
 
    REG_VARIABLE( CFG_RSSI_CATEGORY_GAP_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nRssiCatGap, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RSSI_CATEGORY_GAP_DEFAULT, 
-                 CFG_RSSI_CATEGORY_GAP_MIN, 
-                 CFG_RSSI_CATEGORY_GAP_MAX ),  
+                 hdd_config_t, nRssiCatGap,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RSSI_CATEGORY_GAP_DEFAULT,
+                 CFG_RSSI_CATEGORY_GAP_MIN,
+                 CFG_RSSI_CATEGORY_GAP_MAX ),
 
    REG_VARIABLE( CFG_STAT_TIMER_INTERVAL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nStatTimerInterval, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_STAT_TIMER_INTERVAL_DEFAULT, 
-                 CFG_STAT_TIMER_INTERVAL_MIN, 
+                 hdd_config_t, nStatTimerInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_STAT_TIMER_INTERVAL_DEFAULT,
+                 CFG_STAT_TIMER_INTERVAL_MIN,
                  CFG_STAT_TIMER_INTERVAL_MAX ),
 
    REG_VARIABLE( CFG_SHORT_PREAMBLE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsShortPreamble, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_SHORT_PREAMBLE_DEFAULT, 
-                 CFG_SHORT_PREAMBLE_MIN, 
+                 hdd_config_t, fIsShortPreamble,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_SHORT_PREAMBLE_DEFAULT,
+                 CFG_SHORT_PREAMBLE_MIN,
                  CFG_SHORT_PREAMBLE_MAX ),
 
    REG_VARIABLE( CFG_IBSS_AUTO_BSSID_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsAutoIbssBssid, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_IBSS_AUTO_BSSID_DEFAULT, 
-                 CFG_IBSS_AUTO_BSSID_MIN, 
+                 hdd_config_t, fIsAutoIbssBssid,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_IBSS_AUTO_BSSID_DEFAULT,
+                 CFG_IBSS_AUTO_BSSID_MIN,
                  CFG_IBSS_AUTO_BSSID_MAX ),
 
    REG_VARIABLE_STRING( CFG_IBSS_BSSID_NAME, WLAN_PARAM_MacAddr,
-                        hdd_config_t, IbssBssid, 
+                        hdd_config_t, IbssBssid,
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_IBSS_BSSID_DEFAULT ),
 
    REG_VARIABLE_STRING( CFG_INTF0_MAC_ADDR_NAME, WLAN_PARAM_MacAddr,
-                        hdd_config_t, intfMacAddr[0], 
+                        hdd_config_t, intfMacAddr[0],
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_INTF0_MAC_ADDR_DEFAULT ),
 
    REG_VARIABLE_STRING( CFG_INTF1_MAC_ADDR_NAME, WLAN_PARAM_MacAddr,
-                        hdd_config_t, intfMacAddr[1], 
+                        hdd_config_t, intfMacAddr[1],
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_INTF1_MAC_ADDR_DEFAULT ),
 
    REG_VARIABLE_STRING( CFG_INTF2_MAC_ADDR_NAME, WLAN_PARAM_MacAddr,
-                        hdd_config_t, intfMacAddr[2], 
+                        hdd_config_t, intfMacAddr[2],
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_INTF2_MAC_ADDR_DEFAULT ),
 
    REG_VARIABLE_STRING( CFG_INTF3_MAC_ADDR_NAME, WLAN_PARAM_MacAddr,
-                        hdd_config_t, intfMacAddr[3], 
+                        hdd_config_t, intfMacAddr[3],
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_INTF3_MAC_ADDR_DEFAULT ),
 
@@ -543,14 +543,14 @@
 
 #ifdef WLAN_SOFTAP_FEATURE
    REG_VARIABLE( CFG_AP_QOS_UAPSD_MODE_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, apUapsdEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_AP_QOS_UAPSD_MODE_DEFAULT, 
-                 CFG_AP_QOS_UAPSD_MODE_MIN, 
+                 hdd_config_t, apUapsdEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_AP_QOS_UAPSD_MODE_DEFAULT,
+                 CFG_AP_QOS_UAPSD_MODE_MIN,
                  CFG_AP_QOS_UAPSD_MODE_MAX ),
 
    REG_VARIABLE_STRING( CFG_AP_COUNTRY_CODE, WLAN_PARAM_String,
-                        hdd_config_t, apCntryCode, 
+                        hdd_config_t, apCntryCode,
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_AP_COUNTRY_CODE_DEFAULT ),
 
@@ -562,7 +562,7 @@
                         CFG_AP_ENABLE_RANDOM_BSSID_MAX ),
 
    REG_VARIABLE( CFG_AP_ENABLE_PROTECTION_MODE_NAME, WLAN_PARAM_Integer,
-                        hdd_config_t, apProtEnabled, 
+                        hdd_config_t, apProtEnabled,
                         VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
                         CFG_AP_ENABLE_PROTECTION_MODE_DEFAULT,
                         CFG_AP_ENABLE_PROTECTION_MODE_MIN,
@@ -574,23 +574,23 @@
                         CFG_AP_PROTECTION_MODE_DEFAULT,
                         CFG_AP_PROTECTION_MODE_MIN,
                         CFG_AP_PROTECTION_MODE_MAX ),
-                        
+
    REG_VARIABLE( CFG_AP_OBSS_PROTECTION_MODE_NAME, WLAN_PARAM_Integer,
-                        hdd_config_t, apOBSSProtEnabled, 
+                        hdd_config_t, apOBSSProtEnabled,
                         VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
                         CFG_AP_OBSS_PROTECTION_MODE_DEFAULT,
                         CFG_AP_OBSS_PROTECTION_MODE_MIN,
                         CFG_AP_OBSS_PROTECTION_MODE_MAX ),
-                        
+
    REG_VARIABLE( CFG_AP_STA_SECURITY_SEPERATION_NAME, WLAN_PARAM_Integer,
-                        hdd_config_t, apDisableIntraBssFwd, 
+                        hdd_config_t, apDisableIntraBssFwd,
                         VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
                         CFG_AP_STA_SECURITY_SEPERATION_DEFAULT,
                         CFG_AP_STA_SECURITY_SEPERATION_MIN,
                         CFG_AP_STA_SECURITY_SEPERATION_MAX ),
 
    REG_VARIABLE( CFG_FRAMES_PROCESSING_TH_MODE_NAME, WLAN_PARAM_Integer,
-                        hdd_config_t, MinFramesProcThres, 
+                        hdd_config_t, MinFramesProcThres,
                         VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
                         CFG_FRAMES_PROCESSING_TH_DEFAULT,
                         CFG_FRAMES_PROCESSING_TH_MIN,
@@ -623,7 +623,7 @@
                  CFG_SAP_AUTO_CHANNEL_SELECTION_DEFAULT,
                  CFG_SAP_AUTO_CHANNEL_SELECTION_MIN,
                  CFG_SAP_AUTO_CHANNEL_SELECTION_MAX ),
-   
+
    REG_VARIABLE(CFG_ENABLE_LTE_COEX , WLAN_PARAM_Integer,
                  hdd_config_t, enableLTECoex,
                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -654,110 +654,124 @@
                  CFG_DISABLE_PACKET_FILTER_MAX ),
 
    REG_VARIABLE( CFG_BEACON_INTERVAL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nBeaconInterval, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-                 CFG_BEACON_INTERVAL_DEFAULT, 
-                 CFG_BEACON_INTERVAL_MIN, 
+                 hdd_config_t, nBeaconInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+                 CFG_BEACON_INTERVAL_DEFAULT,
+                 CFG_BEACON_INTERVAL_MIN,
                  CFG_BEACON_INTERVAL_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_HANDOFF_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fIsHandoffEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_HANDOFF_DEFAULT, 
-                 CFG_ENABLE_HANDOFF_MIN, 
+                 hdd_config_t, fIsHandoffEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_HANDOFF_DEFAULT,
+                 CFG_ENABLE_HANDOFF_MIN,
                  CFG_ENABLE_HANDOFF_MAX ),
 
 
    REG_VARIABLE( CFG_ENABLE_IDLE_SCAN_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, nEnableIdleScan, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_IDLE_SCAN_DEFAULT, 
-                 CFG_ENABLE_IDLE_SCAN_MIN, 
+                 hdd_config_t, nEnableIdleScan,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_IDLE_SCAN_DEFAULT,
+                 CFG_ENABLE_IDLE_SCAN_MIN,
                  CFG_ENABLE_IDLE_SCAN_MAX ),
 
    REG_VARIABLE( CFG_ROAMING_TIME_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, nRoamingTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ROAMING_TIME_DEFAULT, 
-                 CFG_ROAMING_TIME_MIN, 
+                 hdd_config_t, nRoamingTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ROAMING_TIME_DEFAULT,
+                 CFG_ROAMING_TIME_MIN,
                  CFG_ROAMING_TIME_MAX ),
 
    REG_VARIABLE( CFG_VCC_RSSI_TRIGGER_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, nVccRssiTrigger, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_VCC_RSSI_TRIGGER_DEFAULT, 
-                 CFG_VCC_RSSI_TRIGGER_MIN, 
+                 hdd_config_t, nVccRssiTrigger,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_VCC_RSSI_TRIGGER_DEFAULT,
+                 CFG_VCC_RSSI_TRIGGER_MIN,
                  CFG_VCC_RSSI_TRIGGER_MAX ),
 
    REG_VARIABLE( CFG_VCC_UL_MAC_LOSS_THRESH_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, nVccUlMacLossThreshold, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT, 
-                 CFG_VCC_UL_MAC_LOSS_THRESH_MIN, 
+                 hdd_config_t, nVccUlMacLossThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT,
+                 CFG_VCC_UL_MAC_LOSS_THRESH_MIN,
                  CFG_VCC_UL_MAC_LOSS_THRESH_MAX ),
 
    REG_VARIABLE( CFG_PASSIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nPassiveMaxChnTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_PASSIVE_MAX_CHANNEL_TIME_DEFAULT, 
-                 CFG_PASSIVE_MAX_CHANNEL_TIME_MIN, 
+                 hdd_config_t, nPassiveMaxChnTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_PASSIVE_MAX_CHANNEL_TIME_DEFAULT,
+                 CFG_PASSIVE_MAX_CHANNEL_TIME_MIN,
                  CFG_PASSIVE_MAX_CHANNEL_TIME_MAX ),
 
    REG_VARIABLE( CFG_PASSIVE_MIN_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nPassiveMinChnTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_PASSIVE_MIN_CHANNEL_TIME_DEFAULT, 
-                 CFG_PASSIVE_MIN_CHANNEL_TIME_MIN, 
+                 hdd_config_t, nPassiveMinChnTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_PASSIVE_MIN_CHANNEL_TIME_DEFAULT,
+                 CFG_PASSIVE_MIN_CHANNEL_TIME_MIN,
                  CFG_PASSIVE_MIN_CHANNEL_TIME_MAX ),
 
    REG_VARIABLE( CFG_ACTIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nActiveMaxChnTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ACTIVE_MAX_CHANNEL_TIME_DEFAULT, 
-                 CFG_ACTIVE_MAX_CHANNEL_TIME_MIN, 
+                 hdd_config_t, nActiveMaxChnTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_MIN,
                  CFG_ACTIVE_MAX_CHANNEL_TIME_MAX ),
 
    REG_VARIABLE( CFG_ACTIVE_MIN_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nActiveMinChnTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT, 
-                 CFG_ACTIVE_MIN_CHANNEL_TIME_MIN, 
+                 hdd_config_t, nActiveMinChnTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_MIN,
                  CFG_ACTIVE_MIN_CHANNEL_TIME_MAX ),
 
+   REG_VARIABLE( CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, nActiveMaxChnTimeBtc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_MIN,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_BTC_MAX ),
+
+   REG_VARIABLE( CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_NAME, WLAN_PARAM_Integer,
+                 hdd_config_t, nActiveMinChnTimeBtc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_MIN,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_BTC_MAX ),
+
 #ifdef WLAN_AP_STA_CONCURRENCY
    REG_VARIABLE( CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nPassiveMaxChnTimeConc, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_DEFAULT, 
-                 CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MIN, 
+                 hdd_config_t, nPassiveMaxChnTimeConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_DEFAULT,
+                 CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MIN,
                  CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MAX ),
 
    REG_VARIABLE( CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nPassiveMinChnTimeConc, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_DEFAULT, 
-                 CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MIN, 
+                 hdd_config_t, nPassiveMinChnTimeConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_DEFAULT,
+                 CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MIN,
                  CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MAX ),
 
    REG_VARIABLE( CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nActiveMaxChnTimeConc, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_DEFAULT, 
-                 CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MIN, 
+                 hdd_config_t, nActiveMaxChnTimeConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_DEFAULT,
+                 CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MIN,
                  CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MAX ),
 
    REG_VARIABLE( CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nActiveMinChnTimeConc, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_DEFAULT, 
-                 CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MIN, 
+                 hdd_config_t, nActiveMinChnTimeConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_DEFAULT,
+                 CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MIN,
                  CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MAX ),
 
    REG_VARIABLE( CFG_REST_TIME_CONC_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nRestTimeConc, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_REST_TIME_CONC_DEFAULT, 
-                 CFG_REST_TIME_CONC_MIN, 
+                 hdd_config_t, nRestTimeConc,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 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,
@@ -767,181 +781,181 @@
                  CFG_NUM_CHAN_COMBINED_CONC_MIN,
                  CFG_NUM_CHAN_COMBINED_CONC_MAX ),
 #endif
-   
+
    REG_VARIABLE( CFG_MAX_PS_POLL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nMaxPsPoll, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_MAX_PS_POLL_DEFAULT, 
-                 CFG_MAX_PS_POLL_MIN, 
+                 hdd_config_t, nMaxPsPoll,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_MAX_PS_POLL_DEFAULT,
+                 CFG_MAX_PS_POLL_MIN,
                  CFG_MAX_PS_POLL_MAX ),
 
     REG_VARIABLE( CFG_MAX_TX_POWER_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nTxPowerCap, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_MAX_TX_POWER_DEFAULT, 
-                 CFG_MAX_TX_POWER_MIN, 
+                 hdd_config_t, nTxPowerCap,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_MAX_TX_POWER_DEFAULT,
+                 CFG_MAX_TX_POWER_MIN,
                  CFG_MAX_TX_POWER_MAX ),
 
    REG_VARIABLE( CFG_LOW_GAIN_OVERRIDE_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, fIsLowGainOverride,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_LOW_GAIN_OVERRIDE_DEFAULT, 
-                 CFG_LOW_GAIN_OVERRIDE_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_LOW_GAIN_OVERRIDE_DEFAULT,
+                 CFG_LOW_GAIN_OVERRIDE_MIN,
                  CFG_LOW_GAIN_OVERRIDE_MAX ),
 
    REG_VARIABLE( CFG_RSSI_FILTER_PERIOD_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, nRssiFilterPeriod,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RSSI_FILTER_PERIOD_DEFAULT, 
-                 CFG_RSSI_FILTER_PERIOD_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RSSI_FILTER_PERIOD_DEFAULT,
+                 CFG_RSSI_FILTER_PERIOD_MIN,
                  CFG_RSSI_FILTER_PERIOD_MAX ),
 
    REG_VARIABLE( CFG_IGNORE_DTIM_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, fIgnoreDtim,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_IGNORE_DTIM_DEFAULT, 
-                 CFG_IGNORE_DTIM_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_IGNORE_DTIM_DEFAULT,
+                 CFG_IGNORE_DTIM_MIN,
                  CFG_IGNORE_DTIM_MAX ),
-                 
+
    REG_VARIABLE( CFG_RX_ANT_CONFIGURATION_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, nRxAnt, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_RX_ANT_CONFIGURATION_NAME_DEFAULT, 
-                CFG_RX_ANT_CONFIGURATION_NAME_MIN, 
+                hdd_config_t, nRxAnt,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_RX_ANT_CONFIGURATION_NAME_DEFAULT,
+                CFG_RX_ANT_CONFIGURATION_NAME_MIN,
                 CFG_RX_ANT_CONFIGURATION_NAME_MAX ),
 
    REG_VARIABLE( CFG_FW_HEART_BEAT_MONITORING_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, fEnableFwHeartBeatMonitoring, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_FW_HEART_BEAT_MONITORING_DEFAULT, 
-                CFG_FW_HEART_BEAT_MONITORING_MIN, 
+                hdd_config_t, fEnableFwHeartBeatMonitoring,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_FW_HEART_BEAT_MONITORING_DEFAULT,
+                CFG_FW_HEART_BEAT_MONITORING_MIN,
                 CFG_FW_HEART_BEAT_MONITORING_MAX ),
 
    REG_VARIABLE( CFG_FW_BEACON_FILTERING_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, fEnableFwBeaconFiltering, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_FW_BEACON_FILTERING_DEFAULT, 
-                CFG_FW_BEACON_FILTERING_MIN, 
+                hdd_config_t, fEnableFwBeaconFiltering,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_FW_BEACON_FILTERING_DEFAULT,
+                CFG_FW_BEACON_FILTERING_MIN,
                 CFG_FW_BEACON_FILTERING_MAX ),
 
    REG_DYNAMIC_VARIABLE( CFG_FW_RSSI_MONITORING_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, fEnableFwRssiMonitoring, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_FW_RSSI_MONITORING_DEFAULT, 
-                CFG_FW_RSSI_MONITORING_MIN, 
+                hdd_config_t, fEnableFwRssiMonitoring,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_FW_RSSI_MONITORING_DEFAULT,
+                CFG_FW_RSSI_MONITORING_MIN,
                 CFG_FW_RSSI_MONITORING_MAX,
                 cbNotifySetFwRssiMonitoring, 0 ),
 
    REG_VARIABLE( CFG_DATA_INACTIVITY_TIMEOUT_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, nDataInactivityTimeout, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT, 
-                CFG_DATA_INACTIVITY_TIMEOUT_MIN, 
+                hdd_config_t, nDataInactivityTimeout,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT,
+                CFG_DATA_INACTIVITY_TIMEOUT_MIN,
                 CFG_DATA_INACTIVITY_TIMEOUT_MAX ),
-                
+
    REG_VARIABLE( CFG_NTH_BEACON_FILTER_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, nthBeaconFilter, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_NTH_BEACON_FILTER_DEFAULT, 
-                CFG_NTH_BEACON_FILTER_MIN, 
-                CFG_NTH_BEACON_FILTER_MAX ),              
+                hdd_config_t, nthBeaconFilter,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_NTH_BEACON_FILTER_DEFAULT,
+                CFG_NTH_BEACON_FILTER_MIN,
+                CFG_NTH_BEACON_FILTER_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_MODE_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, WmmMode, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_MODE_DEFAULT, 
-                 CFG_QOS_WMM_MODE_MIN, 
+                 hdd_config_t, WmmMode,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_MODE_DEFAULT,
+                 CFG_QOS_WMM_MODE_MIN,
                  CFG_QOS_WMM_MODE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_80211E_ENABLED_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, b80211eIsEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_80211E_ENABLED_DEFAULT, 
-                 CFG_QOS_WMM_80211E_ENABLED_MIN, 
+                 hdd_config_t, b80211eIsEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_80211E_ENABLED_DEFAULT,
+                 CFG_QOS_WMM_80211E_ENABLED_MIN,
                  CFG_QOS_WMM_80211E_ENABLED_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_UAPSD_MASK_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, UapsdMask, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_UAPSD_MASK_DEFAULT, 
-                 CFG_QOS_WMM_UAPSD_MASK_MIN, 
+                 hdd_config_t, UapsdMask,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_UAPSD_MASK_DEFAULT,
+                 CFG_QOS_WMM_UAPSD_MASK_MIN,
                  CFG_QOS_WMM_UAPSD_MASK_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_MAX_SP_LEN_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, MaxSpLength, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_MAX_SP_LEN_DEFAULT, 
-                 CFG_QOS_WMM_MAX_SP_LEN_MIN, 
+                 hdd_config_t, MaxSpLength,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_MAX_SP_LEN_DEFAULT,
+                 CFG_QOS_WMM_MAX_SP_LEN_MIN,
                  CFG_QOS_WMM_MAX_SP_LEN_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdVoSrvIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_MIN, 
+                 hdd_config_t, InfraUapsdVoSrvIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_VO_SRV_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdVoSuspIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_MIN, 
+                 hdd_config_t, InfraUapsdVoSuspIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_VO_SUS_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdViSrvIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_MIN, 
+                 hdd_config_t, InfraUapsdViSrvIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_VI_SRV_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdViSuspIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_MIN, 
+                 hdd_config_t, InfraUapsdViSuspIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_VI_SUS_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdBeSrvIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_MIN, 
+                 hdd_config_t, InfraUapsdBeSrvIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_BE_SRV_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdBeSuspIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_MIN, 
+                 hdd_config_t, InfraUapsdBeSuspIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_BE_SUS_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdBkSrvIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_MIN, 
+                 hdd_config_t, InfraUapsdBkSrvIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_BK_SRV_INTV_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraUapsdBkSuspIntv, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MIN, 
+                 hdd_config_t, InfraUapsdBkSuspIntv,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_DEFAULT,
+                 CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MIN,
                  CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MAX ),
 
 #ifdef FEATURE_WLAN_CCX
    REG_VARIABLE( CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, InfraInactivityInterval, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MIN, 
+                 hdd_config_t, InfraInactivityInterval,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_DEFAULT,
+                 CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MIN,
                  CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MAX),
    REG_DYNAMIC_VARIABLE( CFG_CCX_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, isCcxIniFeatureEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_CCX_FEATURE_ENABLED_DEFAULT, 
-                 CFG_CCX_FEATURE_ENABLED_MIN, 
+                 hdd_config_t, isCcxIniFeatureEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_CCX_FEATURE_ENABLED_DEFAULT,
+                 CFG_CCX_FEATURE_ENABLED_MIN,
                  CFG_CCX_FEATURE_ENABLED_MAX,
                  cbNotifySetCcxFeatureEnabled, 0 ),
 #endif // FEATURE_WLAN_CCX
@@ -949,10 +963,10 @@
 #ifdef FEATURE_WLAN_LFR
    // flag to turn ON/OFF Legacy Fast Roaming
    REG_DYNAMIC_VARIABLE( CFG_LFR_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, isFastRoamIniFeatureEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_LFR_FEATURE_ENABLED_DEFAULT, 
-                 CFG_LFR_FEATURE_ENABLED_MIN, 
+                 hdd_config_t, isFastRoamIniFeatureEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_LFR_FEATURE_ENABLED_DEFAULT,
+                 CFG_LFR_FEATURE_ENABLED_MIN,
                        CFG_LFR_FEATURE_ENABLED_MAX,
                        NotifyIsFastRoamIniFeatureEnabled, 0 ),
 #endif // FEATURE_WLAN_LFR
@@ -961,9 +975,9 @@
    // flag to turn ON/OFF 11r and CCX FastTransition
    REG_DYNAMIC_VARIABLE( CFG_FAST_TRANSITION_ENABLED_NAME, WLAN_PARAM_Integer,
                  hdd_config_t, isFastTransitionEnabled,
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_FAST_TRANSITION_ENABLED_NAME_DEFAULT, 
-                 CFG_FAST_TRANSITION_ENABLED_NAME_MIN, 
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_FAST_TRANSITION_ENABLED_NAME_DEFAULT,
+                 CFG_FAST_TRANSITION_ENABLED_NAME_MIN,
                  CFG_FAST_TRANSITION_ENABLED_NAME_MAX,
                  cbNotifySetFastTransitionEnabled, 0 ),
 
@@ -987,211 +1001,211 @@
 #endif
 
    REG_VARIABLE( CFG_QOS_WMM_PKT_CLASSIFY_BASIS_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, PktClassificationBasis, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_PKT_CLASSIFY_BASIS_DEFAULT, 
-                 CFG_QOS_WMM_PKT_CLASSIFY_BASIS_MIN, 
+                 hdd_config_t, PktClassificationBasis,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_PKT_CLASSIFY_BASIS_DEFAULT,
+                 CFG_QOS_WMM_PKT_CLASSIFY_BASIS_MIN,
                  CFG_QOS_WMM_PKT_CLASSIFY_BASIS_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_DIR_AC_VO_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraDirAcVo, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_VO_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_VO_MIN, 
+                 hdd_config_t, InfraDirAcVo,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_VO_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_VO_MIN,
                  CFG_QOS_WMM_INFRA_DIR_AC_VO_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraNomMsduSizeAcVo, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_MIN, 
+                 hdd_config_t, InfraNomMsduSizeAcVo,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_MIN,
                  CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VO_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMeanDataRateAcVo, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_MIN, 
+                 hdd_config_t, InfraMeanDataRateAcVo,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_MIN,
                  CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VO_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMinPhyRateAcVo, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_MIN, 
+                 hdd_config_t, InfraMinPhyRateAcVo,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_MIN,
                  CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VO_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_SBA_AC_VO_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraSbaAcVo, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_VO_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_VO_MIN, 
+                 hdd_config_t, InfraSbaAcVo,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_VO_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_VO_MIN,
                  CFG_QOS_WMM_INFRA_SBA_AC_VO_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_DIR_AC_VI_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraDirAcVi, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_VI_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_VI_MIN, 
+                 hdd_config_t, InfraDirAcVi,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_VI_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_VI_MIN,
                  CFG_QOS_WMM_INFRA_DIR_AC_VI_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraNomMsduSizeAcVi, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_MIN, 
+                 hdd_config_t, InfraNomMsduSizeAcVi,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_MIN,
                  CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_VI_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMeanDataRateAcVi, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_MIN, 
+                 hdd_config_t, InfraMeanDataRateAcVi,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_MIN,
                  CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_VI_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMinPhyRateAcVi, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_MIN, 
+                 hdd_config_t, InfraMinPhyRateAcVi,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_MIN,
                  CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_VI_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_SBA_AC_VI_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraSbaAcVi, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_VI_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_VI_MIN, 
+                 hdd_config_t, InfraSbaAcVi,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_VI_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_VI_MIN,
                  CFG_QOS_WMM_INFRA_SBA_AC_VI_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_DIR_AC_BE_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraDirAcBe, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_BE_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_BE_MIN, 
+                 hdd_config_t, InfraDirAcBe,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_BE_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_BE_MIN,
                  CFG_QOS_WMM_INFRA_DIR_AC_BE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraNomMsduSizeAcBe, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_MIN, 
+                 hdd_config_t, InfraNomMsduSizeAcBe,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_MIN,
                  CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMeanDataRateAcBe, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_MIN, 
+                 hdd_config_t, InfraMeanDataRateAcBe,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_MIN,
                  CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMinPhyRateAcBe, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_MIN, 
+                 hdd_config_t, InfraMinPhyRateAcBe,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_MIN,
                  CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_SBA_AC_BE_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraSbaAcBe, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_BE_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_BE_MIN, 
+                 hdd_config_t, InfraSbaAcBe,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_BE_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_BE_MIN,
                  CFG_QOS_WMM_INFRA_SBA_AC_BE_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_DIR_AC_BK_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, InfraDirAcBk, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_BK_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_DIR_AC_BK_MIN, 
+                 hdd_config_t, InfraDirAcBk,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_BK_DEFAULT,
+                 CFG_QOS_WMM_INFRA_DIR_AC_BK_MIN,
                  CFG_QOS_WMM_INFRA_DIR_AC_BK_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraNomMsduSizeAcBk, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_MIN, 
+                 hdd_config_t, InfraNomMsduSizeAcBk,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_DEFAULT,
+                 CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_MIN,
                  CFG_QOS_WMM_INFRA_NOM_MSDU_SIZE_AC_BK_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMeanDataRateAcBk, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_MIN, 
+                 hdd_config_t, InfraMeanDataRateAcBk,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_MIN,
                  CFG_QOS_WMM_INFRA_MEAN_DATA_RATE_AC_BK_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraMinPhyRateAcBk, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_MIN, 
+                 hdd_config_t, InfraMinPhyRateAcBk,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_DEFAULT,
+                 CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_MIN,
                  CFG_QOS_WMM_INFRA_MIN_PHY_RATE_AC_BK_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_INFRA_SBA_AC_BK_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, InfraSbaAcBk, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_BK_DEFAULT, 
-                 CFG_QOS_WMM_INFRA_SBA_AC_BK_MIN, 
+                 hdd_config_t, InfraSbaAcBk,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_BK_DEFAULT,
+                 CFG_QOS_WMM_INFRA_SBA_AC_BK_MIN,
                  CFG_QOS_WMM_INFRA_SBA_AC_BK_MAX ),
 
    REG_VARIABLE( CFG_TL_WFQ_BK_WEIGHT_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, WfqBkWeight, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_TL_WFQ_BK_WEIGHT_DEFAULT, 
-                 CFG_TL_WFQ_BK_WEIGHT_MIN, 
+                 hdd_config_t, WfqBkWeight,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_TL_WFQ_BK_WEIGHT_DEFAULT,
+                 CFG_TL_WFQ_BK_WEIGHT_MIN,
                  CFG_TL_WFQ_BK_WEIGHT_MAX ),
 
    REG_VARIABLE( CFG_TL_WFQ_BE_WEIGHT_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, WfqBeWeight, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_TL_WFQ_BE_WEIGHT_DEFAULT, 
-                 CFG_TL_WFQ_BE_WEIGHT_MIN, 
+                 hdd_config_t, WfqBeWeight,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_TL_WFQ_BE_WEIGHT_DEFAULT,
+                 CFG_TL_WFQ_BE_WEIGHT_MIN,
                  CFG_TL_WFQ_BE_WEIGHT_MAX ),
 
    REG_VARIABLE( CFG_TL_WFQ_VI_WEIGHT_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, WfqViWeight, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_TL_WFQ_VI_WEIGHT_DEFAULT, 
-                 CFG_TL_WFQ_VI_WEIGHT_MIN, 
+                 hdd_config_t, WfqViWeight,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_TL_WFQ_VI_WEIGHT_DEFAULT,
+                 CFG_TL_WFQ_VI_WEIGHT_MIN,
                  CFG_TL_WFQ_VI_WEIGHT_MAX ),
 
    REG_VARIABLE( CFG_TL_WFQ_VO_WEIGHT_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, WfqVoWeight, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_TL_WFQ_VO_WEIGHT_DEFAULT, 
-                 CFG_TL_WFQ_VO_WEIGHT_MIN, 
+                 hdd_config_t, WfqVoWeight,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_TL_WFQ_VO_WEIGHT_DEFAULT,
+                 CFG_TL_WFQ_VO_WEIGHT_MIN,
                  CFG_TL_WFQ_VO_WEIGHT_MAX ),
 
    REG_VARIABLE( CFG_TL_DELAYED_TRGR_FRM_INT_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, DelayedTriggerFrmInt, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_TL_DELAYED_TRGR_FRM_INT_DEFAULT, 
-                 CFG_TL_DELAYED_TRGR_FRM_INT_MIN, 
+                 hdd_config_t, DelayedTriggerFrmInt,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_TL_DELAYED_TRGR_FRM_INT_DEFAULT,
+                 CFG_TL_DELAYED_TRGR_FRM_INT_MIN,
                  CFG_TL_DELAYED_TRGR_FRM_INT_MAX ),
 
    REG_VARIABLE_STRING( CFG_WOWL_PATTERN_NAME, WLAN_PARAM_String,
-                        hdd_config_t, wowlPattern, 
+                        hdd_config_t, wowlPattern,
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_WOWL_PATTERN_DEFAULT ),
 
    REG_VARIABLE( CFG_QOS_IMPLICIT_SETUP_ENABLED_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, bImplicitQosEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_IMPLICIT_SETUP_ENABLED_DEFAULT, 
-                 CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN, 
+                 hdd_config_t, bImplicitQosEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_IMPLICIT_SETUP_ENABLED_DEFAULT,
+                 CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN,
                  CFG_QOS_IMPLICIT_SETUP_ENABLED_MAX ),
 
    REG_VARIABLE( CFG_19P2_MHZ_PMIC_CLK_ENABLED_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, b19p2MhzPmicClkEnabled, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_19P2_MHZ_PMIC_CLK_ENABLED_DEFAULT, 
-                 CFG_19P2_MHZ_PMIC_CLK_ENABLED_MIN, 
+                 hdd_config_t, b19p2MhzPmicClkEnabled,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_19P2_MHZ_PMIC_CLK_ENABLED_DEFAULT,
+                 CFG_19P2_MHZ_PMIC_CLK_ENABLED_MIN,
                  CFG_19P2_MHZ_PMIC_CLK_ENABLED_MAX ),
 
    REG_VARIABLE( CFG_BTC_EXECUTION_MODE_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, btcExecutionMode, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_BTC_EXECUTION_MODE_DEFAULT, 
-                 CFG_BTC_EXECUTION_MODE_MIN, 
+                 hdd_config_t, btcExecutionMode,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_BTC_EXECUTION_MODE_DEFAULT,
+                 CFG_BTC_EXECUTION_MODE_MIN,
                  CFG_BTC_EXECUTION_MODE_MAX ),
 
    REG_VARIABLE( CFG_BTC_DHCP_PROTECTION_NAME , WLAN_PARAM_Integer,
@@ -1301,11 +1315,11 @@
 
 #ifdef WLAN_SOFTAP_FEATURE
    REG_VARIABLE( CFG_AP_LISTEN_MODE_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, nEnableListenMode, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_AP_LISTEN_MODE_DEFAULT, 
-                 CFG_AP_LISTEN_MODE_MIN, 
-                 CFG_AP_LISTEN_MODE_MAX ),                     
+                 hdd_config_t, nEnableListenMode,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_AP_LISTEN_MODE_DEFAULT,
+                 CFG_AP_LISTEN_MODE_MIN,
+                 CFG_AP_LISTEN_MODE_MAX ),
 
    REG_VARIABLE( CFG_AP_AUTO_SHUT_OFF , WLAN_PARAM_Integer,
                  hdd_config_t, nAPAutoShutOff,
@@ -1317,75 +1331,75 @@
 
 #if defined WLAN_FEATURE_VOWIFI
    REG_VARIABLE( CFG_RRM_ENABLE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fRrmEnable, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RRM_ENABLE_DEFAULT, 
-                 CFG_RRM_ENABLE_MIN, 
+                 hdd_config_t, fRrmEnable,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RRM_ENABLE_DEFAULT,
+                 CFG_RRM_ENABLE_MIN,
                  CFG_RRM_ENABLE_MAX ),
 
    REG_VARIABLE( CFG_RRM_OPERATING_CHAN_MAX_DURATION_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nInChanMeasMaxDuration, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT, 
-                 CFG_RRM_OPERATING_CHAN_MAX_DURATION_MIN, 
+                 hdd_config_t, nInChanMeasMaxDuration,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT,
+                 CFG_RRM_OPERATING_CHAN_MAX_DURATION_MIN,
                  CFG_RRM_OPERATING_CHAN_MAX_DURATION_MAX ),
 
    REG_VARIABLE( CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nOutChanMeasMaxDuration, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT, 
-                 CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MIN, 
+                 hdd_config_t, nOutChanMeasMaxDuration,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT,
+                 CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MIN,
                  CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MAX ),
 
    REG_VARIABLE( CFG_RRM_MEAS_RANDOMIZATION_INTVL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nRrmRandnIntvl, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_RRM_MEAS_RANDOMIZATION_INTVL_DEFAULT, 
-                 CFG_RRM_MEAS_RANDOMIZATION_INTVL_MIN, 
+                 hdd_config_t, nRrmRandnIntvl,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_RRM_MEAS_RANDOMIZATION_INTVL_DEFAULT,
+                 CFG_RRM_MEAS_RANDOMIZATION_INTVL_MIN,
                  CFG_RRM_MEAS_RANDOMIZATION_INTVL_MAX ),
 #endif
 
-#ifdef WLAN_FEATURE_VOWIFI_11R   
+#ifdef WLAN_FEATURE_VOWIFI_11R
    REG_VARIABLE( CFG_FT_ENABLE_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fFTEnable, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_FT_ENABLE_DEFAULT, 
-                 CFG_FT_ENABLE_MIN, 
+                 hdd_config_t, fFTEnable,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_FT_ENABLE_DEFAULT,
+                 CFG_FT_ENABLE_MIN,
                  CFG_FT_ENABLE_MAX ),
 
    REG_VARIABLE( CFG_FT_RESOURCE_REQ_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, fFTResourceReqSupported, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_FT_RESOURCE_REQ_DEFAULT, 
-                 CFG_FT_RESOURCE_REQ_MIN, 
+                 hdd_config_t, fFTResourceReqSupported,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_FT_RESOURCE_REQ_DEFAULT,
+                 CFG_FT_RESOURCE_REQ_MIN,
                  CFG_FT_RESOURCE_REQ_MAX ),
 #endif
 
 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
    REG_VARIABLE( CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nNeighborScanPeriod, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_TIMER_PERIOD_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN, 
+                 hdd_config_t, nNeighborScanPeriod,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_TIMER_PERIOD_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN,
                  CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX ),
 
    REG_VARIABLE( CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nNeighborReassocRssiThreshold, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_DEFAULT, 
-                 CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_MIN, 
+                 hdd_config_t, nNeighborReassocRssiThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_DEFAULT,
+                 CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_MIN,
                  CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_MAX ),
 
    REG_DYNAMIC_VARIABLE( CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nNeighborLookupRssiThreshold, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT, 
-                 CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN, 
+                 hdd_config_t, nNeighborLookupRssiThreshold,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT,
+                 CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN,
                  CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX,
                  cbNotifySetNeighborLookupRssiThreshold, 0 ),
 
    REG_VARIABLE_STRING( CFG_NEIGHBOR_SCAN_CHAN_LIST_NAME, WLAN_PARAM_String,
-                        hdd_config_t, neighborScanChanList, 
+                        hdd_config_t, neighborScanChanList,
                         VAR_FLAGS_OPTIONAL,
                         (void *)CFG_NEIGHBOR_SCAN_CHAN_LIST_DEFAULT ),
 
@@ -1397,10 +1411,10 @@
                  CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX ),
 
    REG_VARIABLE( CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nNeighborScanMaxChanTime, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN, 
+                 hdd_config_t, nNeighborScanMaxChanTime,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN,
                  CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX ),
 
    REG_VARIABLE( CFG_11R_NEIGHBOR_REQ_MAX_TRIES_NAME, WLAN_PARAM_Integer,
@@ -1411,10 +1425,10 @@
                  CFG_11R_NEIGHBOR_REQ_MAX_TRIES_MAX),
 
    REG_DYNAMIC_VARIABLE( CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nNeighborResultsRefreshPeriod, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_DEFAULT, 
-                 CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN, 
+                 hdd_config_t, nNeighborResultsRefreshPeriod,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_DEFAULT,
+                 CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN,
                  CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX,
                  cbNotifySetNeighborResultsRefreshPeriod, 0 ),
 
@@ -1428,10 +1442,10 @@
 #endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
 
    REG_VARIABLE( CFG_QOS_WMM_BURST_SIZE_DEFN_NAME , WLAN_PARAM_Integer,
-                 hdd_config_t, burstSizeDefinition, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_BURST_SIZE_DEFN_DEFAULT, 
-                 CFG_QOS_WMM_BURST_SIZE_DEFN_MIN, 
+                 hdd_config_t, burstSizeDefinition,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_BURST_SIZE_DEFN_DEFAULT,
+                 CFG_QOS_WMM_BURST_SIZE_DEFN_MIN,
                  CFG_QOS_WMM_BURST_SIZE_DEFN_MAX ),
 
    REG_VARIABLE( CFG_MCAST_BCAST_FILTER_SETTING_NAME, WLAN_PARAM_Integer,
@@ -1449,10 +1463,10 @@
                  CFG_ENABLE_HOST_ARPOFFLOAD_MAX ),
 
    REG_VARIABLE( CFG_QOS_WMM_TS_INFO_ACK_POLICY_NAME , WLAN_PARAM_HexInteger,
-                 hdd_config_t, tsInfoAckPolicy, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_QOS_WMM_TS_INFO_ACK_POLICY_DEFAULT, 
-                 CFG_QOS_WMM_TS_INFO_ACK_POLICY_MIN, 
+                 hdd_config_t, tsInfoAckPolicy,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_QOS_WMM_TS_INFO_ACK_POLICY_DEFAULT,
+                 CFG_QOS_WMM_TS_INFO_ACK_POLICY_MIN,
                  CFG_QOS_WMM_TS_INFO_ACK_POLICY_MAX ),
 
     REG_VARIABLE( CFG_SINGLE_TID_RC_NAME, WLAN_PARAM_Integer,
@@ -1484,62 +1498,62 @@
                   CFG_INFRA_STA_KEEP_ALIVE_PERIOD_MAX),
 
     REG_VARIABLE( CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_NAME , WLAN_PARAM_Integer,
-                  hdd_config_t, AddTSWhenACMIsOff, 
-                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                  CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_DEFAULT, 
-                  CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_MIN, 
+                  hdd_config_t, AddTSWhenACMIsOff,
+                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                  CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_DEFAULT,
+                  CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_MIN,
                   CFG_QOS_ADDTS_WHEN_ACM_IS_OFF_MAX ),
 
 
     REG_VARIABLE( CFG_VALIDATE_SCAN_LIST_NAME , WLAN_PARAM_Integer,
-                  hdd_config_t, fValidateScanList, 
-                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                  CFG_VALIDATE_SCAN_LIST_DEFAULT, 
-                  CFG_VALIDATE_SCAN_LIST_MIN, 
+                  hdd_config_t, fValidateScanList,
+                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                  CFG_VALIDATE_SCAN_LIST_DEFAULT,
+                  CFG_VALIDATE_SCAN_LIST_MIN,
                   CFG_VALIDATE_SCAN_LIST_MAX ),
-   
+
     REG_VARIABLE( CFG_NULLDATA_AP_RESP_TIMEOUT_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, nNullDataApRespTimeout, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_NULLDATA_AP_RESP_TIMEOUT_DEFAULT, 
-                CFG_NULLDATA_AP_RESP_TIMEOUT_MIN, 
+                hdd_config_t, nNullDataApRespTimeout,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_NULLDATA_AP_RESP_TIMEOUT_DEFAULT,
+                CFG_NULLDATA_AP_RESP_TIMEOUT_MIN,
                 CFG_NULLDATA_AP_RESP_TIMEOUT_MAX ),
 
     REG_VARIABLE( CFG_AP_DATA_AVAIL_POLL_PERIOD_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, apDataAvailPollPeriodInMs, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_AP_DATA_AVAIL_POLL_PERIOD_DEFAULT, 
-                CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN, 
+                hdd_config_t, apDataAvailPollPeriodInMs,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_AP_DATA_AVAIL_POLL_PERIOD_DEFAULT,
+                CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN,
                 CFG_AP_DATA_AVAIL_POLL_PERIOD_MAX ),
-                                
+
    REG_VARIABLE( CFG_ENABLE_BTAMP_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, enableBtAmp, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_ENABLE_BTAMP_DEFAULT, 
-                 CFG_ENABLE_BTAMP_MIN, 
+                 hdd_config_t, enableBtAmp,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_ENABLE_BTAMP_DEFAULT,
+                 CFG_ENABLE_BTAMP_MIN,
                  CFG_ENABLE_BTAMP_MAX ),
 
 #ifdef WLAN_BTAMP_FEATURE
    REG_VARIABLE( CFG_BT_AMP_PREFERRED_CHANNEL_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, preferredChannel, 
+                 hdd_config_t, preferredChannel,
                  VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
                  CFG_BT_AMP_PREFERRED_CHANNEL_DEFAULT,
                  CFG_BT_AMP_PREFERRED_CHANNEL_MIN,
                  CFG_BT_AMP_PREFERRED_CHANNEL_MAX ),
 #endif //WLAN_BTAMP_FEATURE
    REG_VARIABLE( CFG_BAND_CAPABILITY_NAME, WLAN_PARAM_Integer,
-                 hdd_config_t, nBandCapability, 
-                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                 CFG_BAND_CAPABILITY_DEFAULT, 
-                 CFG_BAND_CAPABILITY_MIN, 
-                 CFG_BAND_CAPABILITY_MAX ), 
+                 hdd_config_t, nBandCapability,
+                 VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                 CFG_BAND_CAPABILITY_DEFAULT,
+                 CFG_BAND_CAPABILITY_MIN,
+                 CFG_BAND_CAPABILITY_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_BEACON_EARLY_TERMINATION_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, fEnableBeaconEarlyTermination, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_ENABLE_BEACON_EARLY_TERMINATION_DEFAULT, 
-                CFG_ENABLE_BEACON_EARLY_TERMINATION_MIN, 
-                CFG_ENABLE_BEACON_EARLY_TERMINATION_MAX ), 
+                hdd_config_t, fEnableBeaconEarlyTermination,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_ENABLE_BEACON_EARLY_TERMINATION_DEFAULT,
+                CFG_ENABLE_BEACON_EARLY_TERMINATION_MIN,
+                CFG_ENABLE_BEACON_EARLY_TERMINATION_MAX ),
 /* CFG_VOS_TRACE_ENABLE Parameters */
    REG_VARIABLE( CFG_VOS_TRACE_ENABLE_BAP_NAME, WLAN_PARAM_Integer,
                 hdd_config_t, vosTraceEnableBAP,
@@ -1653,94 +1667,94 @@
 #endif /* FEATURE_WLAN_INTEGRATED_SOC */
 
   REG_VARIABLE( CFG_TELE_BCN_TRANS_LI_NAME, WLAN_PARAM_Integer,
-               hdd_config_t, nTeleBcnTransListenInterval, 
-               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-               CFG_TELE_BCN_TRANS_LI_DEFAULT, 
-               CFG_TELE_BCN_TRANS_LI_MIN, 
-               CFG_TELE_BCN_TRANS_LI_MAX ), 
+               hdd_config_t, nTeleBcnTransListenInterval,
+               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+               CFG_TELE_BCN_TRANS_LI_DEFAULT,
+               CFG_TELE_BCN_TRANS_LI_MIN,
+               CFG_TELE_BCN_TRANS_LI_MAX ),
 
   REG_VARIABLE( CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_NAME, WLAN_PARAM_Integer,
-               hdd_config_t, nTeleBcnTransLiNumIdleBeacons, 
-               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_DEFAULT, 
-               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MIN, 
-               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MAX ), 
+               hdd_config_t, nTeleBcnTransLiNumIdleBeacons,
+               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_DEFAULT,
+               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MIN,
+               CFG_TELE_BCN_TRANS_LI_NUM_IDLE_BCNS_MAX ),
 
   REG_VARIABLE( CFG_TELE_BCN_MAX_LI_NAME, WLAN_PARAM_Integer,
-               hdd_config_t, nTeleBcnMaxListenInterval, 
-               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-               CFG_TELE_BCN_MAX_LI_DEFAULT, 
-               CFG_TELE_BCN_MAX_LI_MIN, 
-               CFG_TELE_BCN_MAX_LI_MAX ), 
+               hdd_config_t, nTeleBcnMaxListenInterval,
+               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+               CFG_TELE_BCN_MAX_LI_DEFAULT,
+               CFG_TELE_BCN_MAX_LI_MIN,
+               CFG_TELE_BCN_MAX_LI_MAX ),
 
   REG_VARIABLE( CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_NAME, WLAN_PARAM_Integer,
-               hdd_config_t, nTeleBcnMaxLiNumIdleBeacons, 
-               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_DEFAULT, 
-               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MIN, 
-               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MAX ), 
+               hdd_config_t, nTeleBcnMaxLiNumIdleBeacons,
+               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_DEFAULT,
+               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MIN,
+               CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MAX ),
 
   REG_VARIABLE( CFG_BCN_EARLY_TERM_WAKE_NAME, WLAN_PARAM_Integer,
-               hdd_config_t, bcnEarlyTermWakeInterval, 
-               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-               CFG_BCN_EARLY_TERM_WAKE_DEFAULT, 
-               CFG_BCN_EARLY_TERM_WAKE_MIN, 
-               CFG_BCN_EARLY_TERM_WAKE_MAX ), 
+               hdd_config_t, bcnEarlyTermWakeInterval,
+               VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+               CFG_BCN_EARLY_TERM_WAKE_DEFAULT,
+               CFG_BCN_EARLY_TERM_WAKE_MIN,
+               CFG_BCN_EARLY_TERM_WAKE_MAX ),
 
  REG_VARIABLE( CFG_AP_DATA_AVAIL_POLL_PERIOD_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, apDataAvailPollPeriodInMs, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_AP_DATA_AVAIL_POLL_PERIOD_DEFAULT, 
-              CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN, 
+              hdd_config_t, apDataAvailPollPeriodInMs,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_AP_DATA_AVAIL_POLL_PERIOD_DEFAULT,
+              CFG_AP_DATA_AVAIL_POLL_PERIOD_MIN,
               CFG_AP_DATA_AVAIL_POLL_PERIOD_MAX ),
 
    REG_VARIABLE( CFG_ENABLE_CLOSE_LOOP_NAME, WLAN_PARAM_Integer,
-                hdd_config_t, enableCloseLoop, 
-                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                CFG_ENABLE_CLOSE_LOOP_DEFAULT, 
-                CFG_ENABLE_CLOSE_LOOP_MIN, 
+                hdd_config_t, enableCloseLoop,
+                VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                CFG_ENABLE_CLOSE_LOOP_DEFAULT,
+                CFG_ENABLE_CLOSE_LOOP_MIN,
                 CFG_ENABLE_CLOSE_LOOP_MAX ),
 
  REG_VARIABLE( CFG_ENABLE_BYPASS_11D_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableBypass11d, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_BYPASS_11D_DEFAULT, 
-              CFG_ENABLE_BYPASS_11D_MIN, 
+              hdd_config_t, enableBypass11d,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_BYPASS_11D_DEFAULT,
+              CFG_ENABLE_BYPASS_11D_MIN,
               CFG_ENABLE_BYPASS_11D_MAX ),
 
  REG_VARIABLE( CFG_ENABLE_DFS_CHNL_SCAN_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableDFSChnlScan, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_DFS_CHNL_SCAN_DEFAULT, 
-              CFG_ENABLE_DFS_CHNL_SCAN_MIN, 
+              hdd_config_t, enableDFSChnlScan,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_DFS_CHNL_SCAN_DEFAULT,
+              CFG_ENABLE_DFS_CHNL_SCAN_MIN,
               CFG_ENABLE_DFS_CHNL_SCAN_MAX ),
 
  REG_VARIABLE( CFG_ENABLE_DYNAMIC_DTIM_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableDynamicDTIM, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_DYNAMIC_DTIM_DEFAULT, 
-              CFG_ENABLE_DYNAMIC_DTIM_MIN, 
+              hdd_config_t, enableDynamicDTIM,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_DYNAMIC_DTIM_DEFAULT,
+              CFG_ENABLE_DYNAMIC_DTIM_MIN,
               CFG_ENABLE_DYNAMIC_DTIM_MAX ),
 
  REG_VARIABLE( CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableAutomaticTxPowerControl, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_DEFAULT, 
-              CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_MIN, 
+              hdd_config_t, enableAutomaticTxPowerControl,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_DEFAULT,
+              CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_MIN,
               CFG_ENABLE_AUTOMATIC_TX_POWER_CONTROL_MAX ),
 
  REG_VARIABLE( CFG_SHORT_GI_40MHZ_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, ShortGI40MhzEnable, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_SHORT_GI_40MHZ_DEFAULT, 
-              CFG_SHORT_GI_40MHZ_MIN, 
+              hdd_config_t, ShortGI40MhzEnable,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_SHORT_GI_40MHZ_DEFAULT,
+              CFG_SHORT_GI_40MHZ_MIN,
               CFG_SHORT_GI_40MHZ_MAX ),
 
  REG_DYNAMIC_VARIABLE( CFG_REPORT_MAX_LINK_SPEED, WLAN_PARAM_Integer,
-                       hdd_config_t, reportMaxLinkSpeed, 
-                       VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-                       CFG_REPORT_MAX_LINK_SPEED_DEFAULT, 
-                       CFG_REPORT_MAX_LINK_SPEED_MIN, 
+                       hdd_config_t, reportMaxLinkSpeed,
+                       VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+                       CFG_REPORT_MAX_LINK_SPEED_DEFAULT,
+                       CFG_REPORT_MAX_LINK_SPEED_MIN,
                        CFG_REPORT_MAX_LINK_SPEED_MAX,
                        NULL, 0 ),
 
@@ -1788,24 +1802,24 @@
 #endif
 
 REG_VARIABLE( CFG_ENABLE_MCC_ENABLED_NAME, WLAN_PARAM_Integer,
-             hdd_config_t, enableMCC, 
-             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-             CFG_ENABLE_MCC_ENABLED_DEFAULT, 
-             CFG_ENABLE_MCC_ENABLED_MIN, 
+             hdd_config_t, enableMCC,
+             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+             CFG_ENABLE_MCC_ENABLED_DEFAULT,
+             CFG_ENABLE_MCC_ENABLED_MIN,
              CFG_ENABLE_MCC_ENABLED_MAX ),
 
-REG_VARIABLE( CFG_ALLOW_MCC_GO_DIFF_BI_NAME, WLAN_PARAM_Integer, 
+REG_VARIABLE( CFG_ALLOW_MCC_GO_DIFF_BI_NAME, WLAN_PARAM_Integer,
              hdd_config_t, allowMCCGODiffBI,
-             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-             CFG_ALLOW_MCC_GO_DIFF_BI_DEFAULT, 
-             CFG_ALLOW_MCC_GO_DIFF_BI_MIN, 
-             CFG_ALLOW_MCC_GO_DIFF_BI_MAX ),             
+             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+             CFG_ALLOW_MCC_GO_DIFF_BI_DEFAULT,
+             CFG_ALLOW_MCC_GO_DIFF_BI_MIN,
+             CFG_ALLOW_MCC_GO_DIFF_BI_MAX ),
 
 REG_VARIABLE( CFG_THERMAL_MIGRATION_ENABLE_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, thermalMitigationEnable, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_THERMAL_MIGRATION_ENABLE_DEFAULT, 
-              CFG_THERMAL_MIGRATION_ENABLE_MIN, 
+              hdd_config_t, thermalMitigationEnable,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_THERMAL_MIGRATION_ENABLE_DEFAULT,
+              CFG_THERMAL_MIGRATION_ENABLE_MIN,
               CFG_THERMAL_MIGRATION_ENABLE_MAX ),
 #ifdef WLAN_FEATURE_PACKET_FILTERING
  REG_VARIABLE( CFG_MC_ADDR_LIST_FILTER_NAME, WLAN_PARAM_Integer,
@@ -1815,12 +1829,12 @@
               CFG_MC_ADDR_LIST_FILTER_MIN,
               CFG_MC_ADDR_LIST_FILTER_MAX ),
 #endif
-  
+
 REG_VARIABLE( CFG_ENABLE_MODULATED_DTIM_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableModulatedDTIM, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_MODULATED_DTIM_DEFAULT, 
-              CFG_ENABLE_MODULATED_DTIM_MIN, 
+              hdd_config_t, enableModulatedDTIM,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_MODULATED_DTIM_DEFAULT,
+              CFG_ENABLE_MODULATED_DTIM_MIN,
               CFG_ENABLE_MODULATED_DTIM_MAX ),
 
  REG_VARIABLE( CFG_MC_ADDR_LIST_ENABLE_NAME, WLAN_PARAM_Integer,
@@ -1830,55 +1844,55 @@
               CFG_MC_ADDR_LIST_ENABLE_MIN,
               CFG_MC_ADDR_LIST_ENABLE_MAX ),
 
-#ifdef WLAN_FEATURE_11AC              
+#ifdef WLAN_FEATURE_11AC
 REG_VARIABLE( CFG_VHT_CHANNEL_WIDTH, WLAN_PARAM_Integer,
-              hdd_config_t, vhtChannelWidth, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-              CFG_VHT_CHANNEL_WIDTH_DEFAULT, 
-              CFG_VHT_CHANNEL_WIDTH_MIN, 
+              hdd_config_t, vhtChannelWidth,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+              CFG_VHT_CHANNEL_WIDTH_DEFAULT,
+              CFG_VHT_CHANNEL_WIDTH_MIN,
               CFG_VHT_CHANNEL_WIDTH_MAX),
 
 REG_VARIABLE( CFG_VHT_ENABLE_RX_MCS_8_9, WLAN_PARAM_Integer,
-              hdd_config_t, vhtRxMCS, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-              CFG_VHT_ENABLE_RX_MCS_8_9_DEFAULT, 
-              CFG_VHT_ENABLE_RX_MCS_8_9_MIN, 
+              hdd_config_t, vhtRxMCS,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+              CFG_VHT_ENABLE_RX_MCS_8_9_DEFAULT,
+              CFG_VHT_ENABLE_RX_MCS_8_9_MIN,
               CFG_VHT_ENABLE_RX_MCS_8_9_MAX),
 
 REG_VARIABLE( CFG_VHT_ENABLE_TX_MCS_8_9, WLAN_PARAM_Integer,
-              hdd_config_t, vhtTxMCS, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-              CFG_VHT_ENABLE_TX_MCS_8_9_DEFAULT, 
-              CFG_VHT_ENABLE_TX_MCS_8_9_MIN, 
+              hdd_config_t, vhtTxMCS,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+              CFG_VHT_ENABLE_TX_MCS_8_9_DEFAULT,
+              CFG_VHT_ENABLE_TX_MCS_8_9_MIN,
               CFG_VHT_ENABLE_TX_MCS_8_9_MAX),
 #endif
 
 REG_VARIABLE( CFG_ENABLE_FIRST_SCAN_2G_ONLY_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, enableFirstScan2GOnly, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_FIRST_SCAN_2G_ONLY_DEFAULT, 
-              CFG_ENABLE_FIRST_SCAN_2G_ONLY_MIN, 
+              hdd_config_t, enableFirstScan2GOnly,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_FIRST_SCAN_2G_ONLY_DEFAULT,
+              CFG_ENABLE_FIRST_SCAN_2G_ONLY_MIN,
               CFG_ENABLE_FIRST_SCAN_2G_ONLY_MAX ),
 
 REG_VARIABLE( CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, skipDfsChnlInP2pSearch, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_DEFAULT, 
-              CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MIN, 
+              hdd_config_t, skipDfsChnlInP2pSearch,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_DEFAULT,
+              CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MIN,
               CFG_ENABLE_SKIP_DFS_IN_P2P_SEARCH_MAX ),
 
 REG_VARIABLE( CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_NAME, WLAN_PARAM_Integer,
-              hdd_config_t, ignoreDynamicDtimInP2pMode, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_DEFAULT, 
-              CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_MIN, 
+              hdd_config_t, ignoreDynamicDtimInP2pMode,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_DEFAULT,
+              CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_MIN,
               CFG_IGNORE_DYNAMIC_DTIM_IN_P2P_MODE_MAX ),
 
 REG_VARIABLE( CFG_NUM_BUFF_ADVERT_NAME, WLAN_PARAM_Integer,
-              hdd_config_t,numBuffAdvert , 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, 
-              CFG_NUM_BUFF_ADVERT_DEFAULT, 
-              CFG_NUM_BUFF_ADVERT_MIN, 
+              hdd_config_t,numBuffAdvert ,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
+              CFG_NUM_BUFF_ADVERT_DEFAULT,
+              CFG_NUM_BUFF_ADVERT_MIN,
               CFG_NUM_BUFF_ADVERT_MAX ),
 
  REG_VARIABLE( CFG_ENABLE_IGNORE_CHAN165, WLAN_PARAM_Integer,
@@ -1895,10 +1909,10 @@
              CFG_MCC_CONFIG_PARAM_MIN,
              CFG_MCC_CONFIG_PARAM_MAX ),
 REG_VARIABLE( CFG_ENABLE_RX_STBC, WLAN_PARAM_Integer,
-              hdd_config_t, enableRxSTBC, 
-              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-              CFG_ENABLE_RX_STBC_DEFAULT, 
-              CFG_ENABLE_RX_STBC_MIN, 
+              hdd_config_t, enableRxSTBC,
+              VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+              CFG_ENABLE_RX_STBC_DEFAULT,
+              CFG_ENABLE_RX_STBC_MIN,
               CFG_ENABLE_RX_STBC_MAX ),
 #ifdef FEATURE_WLAN_TDLS
 REG_VARIABLE( CFG_TDLS_SUPPORT_ENABLE, WLAN_PARAM_Integer,
@@ -1988,10 +2002,10 @@
               CFG_VSTA_SUPPORT_ENABLE_MAX ),
 #endif
 REG_VARIABLE( CFG_ENABLE_LPWR_IMG_TRANSITION_NAME, WLAN_PARAM_Integer,
-             hdd_config_t, enableLpwrImgTransition, 
-             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, 
-             CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT, 
-             CFG_ENABLE_LPWR_IMG_TRANSITION_MIN, 
+             hdd_config_t, enableLpwrImgTransition,
+             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+             CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT,
+             CFG_ENABLE_LPWR_IMG_TRANSITION_MIN,
              CFG_ENABLE_LPWR_IMG_TRANSITION_MAX ),
 
 #ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE
@@ -2002,6 +2016,13 @@
               CFG_ACTIVEMODE_OFFLOAD_ENABLE_MIN,
               CFG_ACTIVEMODE_OFFLOAD_ENABLE_MAX ),
 #endif
+REG_VARIABLE( CFG_ENABLE_LPWR_IMG_TRANSITION_NAME, WLAN_PARAM_Integer,
+             hdd_config_t, enableLpwrImgTransition,
+             VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+             CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT,
+             CFG_ENABLE_LPWR_IMG_TRANSITION_MIN,
+             CFG_ENABLE_LPWR_IMG_TRANSITION_MAX ),
+
 
 REG_VARIABLE( CFG_SCAN_AGING_PARAM_NAME, WLAN_PARAM_Integer,
              hdd_config_t, scanAgingTimeout,
@@ -2080,7 +2101,7 @@
   }
 
   c = *str;
-  while(c != '\n'  && c != '\0' && c != 0xd)  { 
+  while(c != '\n'  && c != '\0' && c != 0xd)  {
     str = str + 1;
     c = *str;
   }
@@ -2090,7 +2111,7 @@
   }
   else
   {
-    *str = '\0'; 
+    *str = '\0';
     return (str+1);
   }
 
@@ -2129,7 +2150,7 @@
    for (; ptr != str && i_isspace(*ptr); ptr--);
       /* Null terminate the following character */
       ptr[1] = '\0';
-                                  
+
    return str;
 }
 
@@ -2141,20 +2162,20 @@
    char *value;
 }tCfgIniEntry;
 
-static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t * pHddCtx, 
+static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t * pHddCtx,
     tCfgIniEntry* iniTable, unsigned long entries);
 
 #ifdef WLAN_CFG_DEBUG
-void dump_cfg_ini (tCfgIniEntry* iniTable, unsigned long entries) 
+void dump_cfg_ini (tCfgIniEntry* iniTable, unsigned long entries)
 {
    unsigned long i;
 
    for (i = 0; i < entries; i++) {
-       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "%s entry Name=[%s] value=[%s]", 
+       VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "%s entry Name=[%s] value=[%s]",
            WLAN_INI_FILE, iniTable[i].name, iniTable[i].value);
      }
 }
-#endif 
+#endif
 
 /*
  * This function reads the qcom_cfg.ini file and
@@ -2175,33 +2196,33 @@
    memset(cfgIniTable, 0, sizeof(cfgIniTable));
 
    status = request_firmware(&fw, WLAN_INI_FILE, pHddCtx->parent_dev);
-   
+
    if(status)
    {
       hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d\n",__func__, status);
-      return VOS_STATUS_E_FAILURE;   
+      return VOS_STATUS_E_FAILURE;
    }
-   if(!fw || !fw->data || !fw->size) 
+   if(!fw || !fw->data || !fw->size)
    {
       hddLog(VOS_TRACE_LEVEL_FATAL, "%s: %s download failed\n",
              __func__, WLAN_INI_FILE);
       return VOS_STATUS_E_FAILURE;
-   } 
+   }
 
    hddLog(LOG1, "%s: qcom_cfg.ini Size %d\n",__func__, fw->size);
 
    buffer = (char*)vos_mem_malloc(fw->size);
-   
+
    if(NULL == buffer) {
       hddLog(VOS_TRACE_LEVEL_FATAL, "%s: kmalloc failure",__func__);
       release_firmware(fw);
       return VOS_STATUS_E_FAILURE;
-   } 
+   }
    pTemp = buffer;
 
    vos_mem_copy((void*)buffer,(void *)fw->data, fw->size);
    size = fw->size;
-  
+
    while (buffer != NULL)
    {
       line = get_next_line(buffer);
@@ -2219,7 +2240,7 @@
       else
       {
          name = buffer;
-         while(*buffer != '=' && *buffer != '\0') 
+         while(*buffer != '=' && *buffer != '\0')
             buffer++;
          if(*buffer != '\0') {
             *buffer++ = '\0';
@@ -2228,7 +2249,7 @@
                buffer = i_trim(buffer);
                if(strlen(buffer)>0) {
                   value = buffer;
-                  while(!i_isspace(*buffer) && *buffer != '\0') 
+                  while(!i_isspace(*buffer) && *buffer != '\0')
                      buffer++;
                   *buffer = '\0';
                   cfgIniTable[i].name= name;
@@ -2251,7 +2272,7 @@
    release_firmware(fw);
    vos_mem_free(pTemp);
    return vos_status;
-} 
+}
 
 
 static void print_hdd_cfg(hdd_context_t *pHddCtx)
@@ -2269,7 +2290,7 @@
       pHddCtx->cfg_ini->IbssBssid.bytes[2],pHddCtx->cfg_ini->IbssBssid.bytes[3],
       pHddCtx->cfg_ini->IbssBssid.bytes[4],pHddCtx->cfg_ini->IbssBssid.bytes[5]);
 
-  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, 
+  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
           "Name = [Intf0MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
                                   pHddCtx->cfg_ini->intfMacAddr[0].bytes[0],
                                   pHddCtx->cfg_ini->intfMacAddr[0].bytes[1],
@@ -2279,7 +2300,7 @@
                                   pHddCtx->cfg_ini->intfMacAddr[0].bytes[5]);
 
 
-  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, 
+  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
           "Name = [Intf1MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
                                   pHddCtx->cfg_ini->intfMacAddr[1].bytes[0],
                                   pHddCtx->cfg_ini->intfMacAddr[1].bytes[1],
@@ -2288,7 +2309,7 @@
                                   pHddCtx->cfg_ini->intfMacAddr[1].bytes[4],
                                   pHddCtx->cfg_ini->intfMacAddr[1].bytes[5]);
 
-  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, 
+  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
           "Name = [Intf2MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
                                   pHddCtx->cfg_ini->intfMacAddr[2].bytes[0],
                                   pHddCtx->cfg_ini->intfMacAddr[2].bytes[1],
@@ -2297,7 +2318,7 @@
                                   pHddCtx->cfg_ini->intfMacAddr[2].bytes[4],
                                   pHddCtx->cfg_ini->intfMacAddr[2].bytes[5]);
 
-  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, 
+  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
           "Name = [Intf3MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]",
                                   pHddCtx->cfg_ini->intfMacAddr[3].bytes[0],
                                   pHddCtx->cfg_ini->intfMacAddr[3].bytes[1],
@@ -2316,12 +2337,12 @@
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApProt] value = [%u]", pHddCtx->cfg_ini->apProtEnabled);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]\n", pHddCtx->cfg_ini->nAPAutoShutOff);
 
-  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]\n", pHddCtx->cfg_ini->nEnableListenMode);  
+  VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]\n", pHddCtx->cfg_ini->nEnableListenMode);
   VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]\n",pHddCtx->cfg_ini->apProtection);
   VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]\n",pHddCtx->cfg_ini->apOBSSProtEnabled);
   VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApAutoChannelSelection] value = [%u]\n",pHddCtx->cfg_ini->apAutoChannelSelection);
 #endif
-  
+
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%lu]",pHddCtx->cfg_ini->nChannelBondingMode24GHz);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%lu]",pHddCtx->cfg_ini->nChannelBondingMode5GHz);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [dot11Mode] Value = [%lu]",pHddCtx->cfg_ini->dot11Mode);
@@ -2346,10 +2367,10 @@
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [CcxEnabled] Value = [%lu] ",pHddCtx->cfg_ini->isCcxIniFeatureEnabled);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [FastTransitionEnabled] Value = [%lu] ",pHddCtx->cfg_ini->isFastTransitionEnabled);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gTxPowerCap] Value = [%lu] dBm ",pHddCtx->cfg_ini->nTxPowerCap);
-#endif 
+#endif
 #ifdef FEATURE_WLAN_LFR
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%lu] ",pHddCtx->cfg_ini->isFastRoamIniFeatureEnabled);
-#endif 
+#endif
 #if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%lu] ",pHddCtx->cfg_ini->RoamRssiDiff);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ImmediateRoamRssiDiff] Value = [%lu] ",pHddCtx->cfg_ini->nImmediateRoamRssiDiff);
@@ -2385,7 +2406,7 @@
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [DelayedTriggerFrmInt] Value = [%lu] ",pHddCtx->cfg_ini->DelayedTriggerFrmInt);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [mcastBcastFilterSetting] Value = [%u] ",pHddCtx->cfg_ini->mcastBcastFilterSetting);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [fhostArpOffload] Value = [%u] ",pHddCtx->cfg_ini->fhostArpOffload);
-#ifdef WLAN_FEATURE_VOWIFI_11R  
+#ifdef WLAN_FEATURE_VOWIFI_11R
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [fFTEnable] Value = [%lu] ",pHddCtx->cfg_ini->fFTEnable);
   VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [fFTResourceReqSupported] Value = [%lu] ",pHddCtx->cfg_ini->fFTResourceReqSupported);
 #endif
@@ -2458,13 +2479,13 @@
    // start with an empty string
    *pCur = '\0';
 
-   for ( idx = 0; idx < cRegTableEntries; idx++, pRegEntry++ ) 
+   for ( idx = 0; idx < cRegTableEntries; idx++, pRegEntry++ )
    {
       pField = ( (v_U8_t *)pHddCtx->cfg_ini) + pRegEntry->VarOffset;
 
       if ( ( WLAN_PARAM_Integer       == pRegEntry->RegType ) ||
            ( WLAN_PARAM_SignedInteger == pRegEntry->RegType ) ||
-           ( WLAN_PARAM_HexInteger    == pRegEntry->RegType ) ) 
+           ( WLAN_PARAM_HexInteger    == pRegEntry->RegType ) )
       {
          value = 0;
          memcpy( &value, pField, pRegEntry->VarSize );
@@ -2541,7 +2562,7 @@
 }
 
 static VOS_STATUS find_cfg_item (tCfgIniEntry* iniTable, unsigned long entries,
-    char *name, char** value) 
+    char *name, char** value)
 {
    VOS_STATUS status = VOS_STATUS_E_FAILURE;
    unsigned long i;
@@ -2744,15 +2765,15 @@
       {
 #ifdef WLAN_CFG_DEBUG
          VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s\n",
-            pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, (char*)pRegEntry->VarDefault); 
+            pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, (char*)pRegEntry->VarDefault);
 #endif
 
-         if ( match_status == VOS_STATUS_SUCCESS) 
+         if ( match_status == VOS_STATUS_SUCCESS)
          {
             len_value_str = strlen(value_str);
 
             if(len_value_str > (pRegEntry->VarSize - 1)) {
-               hddLog(LOGE, "%s: Invalid Value=[%s] specified for Name=[%s] in %s\n", 
+               hddLog(LOGE, "%s: Invalid Value=[%s] specified for Name=[%s] in %s\n",
                   __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
                cbOutString = utilMin( strlen( (char *)pRegEntry->VarDefault ), pRegEntry->VarSize - 1 );
                memcpy( pField, (void *)(pRegEntry->VarDefault), cbOutString );
@@ -2764,26 +2785,26 @@
                ( (v_U8_t *)pField )[ len_value_str ] = '\0';
             }
          }
-         else 
+         else
          {
             // Failed to read the string parameter from the registry.  Use the default.
             cbOutString = utilMin( strlen( (char *)pRegEntry->VarDefault ), pRegEntry->VarSize - 1 );
             memcpy( pField, (void *)(pRegEntry->VarDefault), cbOutString );
-            ( (v_U8_t *)pField )[ cbOutString ] = '\0';                 
+            ( (v_U8_t *)pField )[ cbOutString ] = '\0';
          }
       }
       else if ( WLAN_PARAM_MacAddr == pRegEntry->RegType )
       {
          if(pRegEntry->VarSize != VOS_MAC_ADDR_SIZE) {
-               hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]\n", 
-                   __func__, pRegEntry->VarSize, pRegEntry->RegName); 
+               hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]\n",
+                   __func__, pRegEntry->VarSize, pRegEntry->RegName);
             continue;
          }
          candidate = (char*)pRegEntry->VarDefault;
          if ( match_status == VOS_STATUS_SUCCESS) {
             len_value_str = strlen(value_str);
             if(len_value_str != (VOS_MAC_ADDR_SIZE*2)) {
-               hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s\n", 
+               hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s\n",
                   __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE);
             }
             else
@@ -2792,13 +2813,13 @@
          //parse the string and store it in the byte array
          for(i=0; i<VOS_MAC_ADDR_SIZE; i++)
          {
-            ((char*)pField)[i] = 
-              (char)(parseHexDigit(candidate[i*2])*16 + parseHexDigit(candidate[i*2+1])); 
+            ((char*)pField)[i] =
+              (char)(parseHexDigit(candidate[i*2])*16 + parseHexDigit(candidate[i*2+1]));
          }
       }
       else
       {
-         hddLog(LOGE, "%s: Unknown param type for name[%s] in registry table\n", 
+         hddLog(LOGE, "%s: Unknown param type for name[%s] in registry table\n",
             __func__, pRegEntry->RegName);
       }
 
@@ -2817,7 +2838,7 @@
 
 eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode( eHddDot11Mode dot11Mode )
 {
-   switch (dot11Mode) 
+   switch (dot11Mode)
    {
       case (eHDD_DOT11_MODE_abg):
          return eCSR_DOT11_MODE_abg;
@@ -2846,11 +2867,11 @@
 
 }
 
-static void hdd_set_btc_config(hdd_context_t *pHddCtx) 
+static void hdd_set_btc_config(hdd_context_t *pHddCtx)
 {
    hdd_config_t *pConfig = pHddCtx->cfg_ini;
    tSmeBtcConfig btcParams;
-   
+
    sme_BtcGetConfig(pHddCtx->hHal, &btcParams);
 
    btcParams.btcExecutionMode = pConfig->btcExecutionMode;
@@ -2874,14 +2895,14 @@
    sme_BtcSetConfig(pHddCtx->hHal, &btcParams);
 }
 
-static void hdd_set_power_save_config(hdd_context_t *pHddCtx, tSmeConfigParams *smeConfig) 
+static void hdd_set_power_save_config(hdd_context_t *pHddCtx, tSmeConfigParams *smeConfig)
 {
    hdd_config_t *pConfig = pHddCtx->cfg_ini;
 
    tPmcBmpsConfigParams bmpsParams;
-   
+
    sme_GetConfigPowerSave(pHddCtx->hHal, ePMC_BEACON_MODE_POWER_SAVE, &bmpsParams);
-   
+
    if (strcmp(pConfig->PowerUsageControl, "Min") == 0)
    {
       smeConfig->csrConfig.impsSleepTime   = pConfig->nImpsMinSleepTime;
@@ -2932,7 +2953,7 @@
    {
       hddLog(LOGE, "SetConfigPowerSave failed to set BMPS params\n");
    }
-  
+
    if(pConfig->fIsAutoBmpsTimerEnabled)
    {
       sme_StartAutoBmpsTimer(pHddCtx->hHal);
@@ -2967,7 +2988,7 @@
    }
 
    return VOS_STATUS_SUCCESS;
-   
+
 }
 #endif
 
@@ -2983,14 +3004,14 @@
    tSirMacHTCapabilityInfo htCapInfo;
 
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_GI_20MHZ, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_GI_20MHZ,
       pConfig->ShortGI20MhzEnable, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_20MHZ to CCM\n");
    }
-       
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_CAL_CONTROL, pConfig->Calibration, 
+
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_CAL_CONTROL, pConfig->Calibration,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3006,18 +3027,18 @@
 
    if ( 0 != pConfig->Cfg1Id )
    {
-      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg1Id, pConfig->Cfg1Value, NULL, 
+      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg1Id, pConfig->Cfg1Value, NULL,
          eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
          hddLog(LOGE, "Could not pass on Cfg1Id to CCM\n");
       }
-          
+
    }
 
    if ( 0 != pConfig->Cfg2Id )
    {
-      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg2Id, pConfig->Cfg2Value, 
+      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg2Id, pConfig->Cfg2Value,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
@@ -3027,7 +3048,7 @@
 
    if ( 0 != pConfig->Cfg3Id )
    {
-      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg3Id, pConfig->Cfg3Value, 
+      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg3Id, pConfig->Cfg3Value,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
@@ -3037,7 +3058,7 @@
 
    if ( 0 != pConfig->Cfg4Id )
    {
-      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg4Id, pConfig->Cfg4Value, 
+      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg4Id, pConfig->Cfg4Value,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
@@ -3047,7 +3068,7 @@
 
    if ( 0 != pConfig->Cfg5Id )
    {
-      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg5Id, pConfig->Cfg5Value, 
+      if (ccmCfgSetInt(pHddCtx->hHal, pConfig->Cfg5Id, pConfig->Cfg5Value,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
@@ -3055,21 +3076,21 @@
       }
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_BA_AUTO_SETUP, pConfig->BlockAckAutoSetup, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_BA_AUTO_SETUP, pConfig->BlockAckAutoSetup,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_BA_AUTO_SETUP to CCM\n");
    }
-       
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FIXED_RATE, pConfig->TxRate, 
+
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FIXED_RATE, pConfig->TxRate,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_FIXED_RATE to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR,
       pConfig->MaxRxAmpduFactor, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3083,9 +3104,9 @@
       hddLog(LOGE,"Could not pass on WNI_CFG_SHORT_PREAMBLE to CCM\n");
    }
 
-   if (pConfig->fIsAutoIbssBssid) 
+   if (pConfig->fIsAutoIbssBssid)
    {
-      if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, (v_U8_t *)"000000000000", 
+      if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, (v_U8_t *)"000000000000",
          sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
       {
          fStatus = FALSE;
@@ -3093,14 +3114,14 @@
       }
    }
    else
-   { 
+   {
       if ( VOS_FALSE == vos_is_macaddr_group( &pConfig->IbssBssid ))
       {
          VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED,
                     "MAC Addr (IBSS BSSID) read from Registry is: %02x-%02x-%02x-%02x-%02x-%02x",
-                    pConfig->IbssBssid.bytes[0], pConfig->IbssBssid.bytes[1], pConfig->IbssBssid.bytes[2], 
+                    pConfig->IbssBssid.bytes[0], pConfig->IbssBssid.bytes[1], pConfig->IbssBssid.bytes[2],
                     pConfig->IbssBssid.bytes[3], pConfig->IbssBssid.bytes[4], pConfig->IbssBssid.bytes[5]);
-         if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, pConfig->IbssBssid.bytes, 
+         if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, pConfig->IbssBssid.bytes,
             sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
          {
             fStatus = FALSE;
@@ -3114,14 +3135,14 @@
       }
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_BEACON_INTERVAL, pConfig->nBeaconInterval, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_BEACON_INTERVAL, pConfig->nBeaconInterval,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_BEACON_INTERVAL to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_PS_POLL, pConfig->nMaxPsPoll, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_PS_POLL, pConfig->nMaxPsPoll,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3134,13 +3155,13 @@
       hddLog(LOGE, "Failure: Could not pass on WNI_CFG_CURRENT_RX_ANTENNA configuration info to HAL\n"  );
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, pConfig->fIsLowGainOverride, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, pConfig->fIsLowGainOverride,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Could not pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL\n");
    }
- 
+
    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RSSI_FILTER_PERIOD, pConfig->nRssiFilterPeriod,
          NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
@@ -3155,14 +3176,14 @@
       hddLog(LOGE, "Could not pass on WNI_IGNORE_DTIM configuration to CCM\n"  );
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT, pConfig->fEnableFwHeartBeatMonitoring, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT, pConfig->fEnableFwHeartBeatMonitoring,
                     NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_HEART_BEAT configuration info to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER, pConfig->fEnableFwBeaconFiltering, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER, pConfig->fEnableFwBeaconFiltering,
                     NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3181,21 +3202,21 @@
        pConfig->fEnableFwRssiMonitoring = TRUE;
    }
 #endif
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, pConfig->fEnableFwRssiMonitoring, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, pConfig->fEnableFwRssiMonitoring,
                     NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_RSSI_MONITOR configuration info to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, pConfig->nDataInactivityTimeout, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, pConfig->nDataInactivityTimeout,
                     NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
       hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_NTH_BEACON_FILTER, pConfig->nthBeaconFilter, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_NTH_BEACON_FILTER, pConfig->nthBeaconFilter,
                     NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3203,97 +3224,97 @@
    }
 
 #ifdef WLAN_SOFTAP_FEATURE
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LTE_COEX, pConfig->enableLTECoex, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LTE_COEX, pConfig->enableLTECoex,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LTE_COEX to CCM\n");
      }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE, pConfig->nEnableListenMode, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE, pConfig->nEnableListenMode,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CCM\n");
      }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, pConfig->apKeepAlivePeriod, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, pConfig->apKeepAlivePeriod,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE, "Could not pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CCM\n");
-     } 
+     }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, pConfig->goKeepAlivePeriod, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, pConfig->goKeepAlivePeriod,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE, "Could not pass on WNI_CFG_GO_KEEP_ALIVE_TIMEOUT to CCM\n");
      }
 #endif
-   
+
 #if defined WLAN_FEATURE_VOWIFI
-    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_ENABLED, pConfig->fRrmEnable, 
+    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_ENABLED, pConfig->fRrmEnable,
                      NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
        fStatus = FALSE;
        hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_ENABLE configuration info to CCM\n");
     }
 
-    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_OPERATING_CHAN_MAX, pConfig->nInChanMeasMaxDuration, 
+    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_OPERATING_CHAN_MAX, pConfig->nInChanMeasMaxDuration,
                      NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
        fStatus = FALSE;
        hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OPERATING_CHAN_MAX configuration info to CCM\n");
     }
 
-    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_NON_OPERATING_CHAN_MAX, pConfig->nOutChanMeasMaxDuration, 
+    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_NON_OPERATING_CHAN_MAX, pConfig->nOutChanMeasMaxDuration,
                      NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
        fStatus = FALSE;
        hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OUT_CHAN_MAX configuration info to CCM\n");
     }
 
-    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, pConfig->mcastBcastFilterSetting, 
+    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, pConfig->mcastBcastFilterSetting,
                      NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
 #endif
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, pConfig->bSingleTidRc, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, pConfig->bSingleTidRc,
                       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_SINGLE_TID_RC configuration info to CCM\n");
      }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_WAKEUP_EN, pConfig->teleBcnWakeupEn, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_WAKEUP_EN, pConfig->teleBcnWakeupEn,
                       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_WAKEUP_EN configuration info to CCM\n"  );
      }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI, pConfig->nTeleBcnTransListenInterval, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI, pConfig->nTeleBcnTransListenInterval,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
       fStatus = FALSE;
       hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI configuration info to CCM\n"  );
     }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI, pConfig->nTeleBcnMaxListenInterval, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI, pConfig->nTeleBcnMaxListenInterval,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
       fStatus = FALSE;
       hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_MAX_LI configuration info to CCM\n"  );
     }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, pConfig->nTeleBcnTransLiNumIdleBeacons, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, pConfig->nTeleBcnTransLiNumIdleBeacons,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
       fStatus = FALSE;
       hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS configuration info to CCM\n"  );
     }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, pConfig->nTeleBcnMaxLiNumIdleBeacons, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, pConfig->nTeleBcnMaxLiNumIdleBeacons,
       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
       fStatus = FALSE;
@@ -3307,13 +3328,13 @@
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RF_SETTLING_TIME_CLK configuration info to CCM\n"  );
     }
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, pConfig->infraStaKeepAlivePeriod, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, pConfig->infraStaKeepAlivePeriod,
                       NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD configuration info to CCM\n"  );
      }
-    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE, pConfig->dynamicPsPollValue, 
+    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE, pConfig->dynamicPsPollValue,
                      NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
     {
        fStatus = FALSE;
@@ -3325,35 +3346,35 @@
     {
        fStatus = FALSE;
        hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT configuration info to CCM\n"  );
-    } 
+    }
 
    if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs,
                NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
        fStatus = FALSE;
        hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM\n"  );
-   } 
+   }
 #ifdef FEATURE_WLAN_INTEGRATED_SOC
-    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, pConfig->FragmentationThreshold, 
+    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, pConfig->FragmentationThreshold,
                    NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
     {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_FRAGMENTATION_THRESHOLD configuration info to CCM\n"  );
     }
-    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RTS_THRESHOLD, pConfig->RTSThreshold, 
+    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RTS_THRESHOLD, pConfig->RTSThreshold,
                         NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
     {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RTS_THRESHOLD configuration info to CCM\n"  );
     }
 
-    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_11D_ENABLED, pConfig->Is11dSupportEnabled, 
+    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_11D_ENABLED, pConfig->Is11dSupportEnabled,
                         NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
     {
         fStatus = FALSE;
         hddLog(LOGE,"Failure: Could not pass on WNI_CFG_11D_ENABLED configuration info to CCM\n"  );
     }
-    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HEART_BEAT_THRESHOLD, pConfig->HeartbeatThresh24, 
+    if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HEART_BEAT_THRESHOLD, pConfig->HeartbeatThresh24,
                         NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
     {
         fStatus = FALSE;
@@ -3368,7 +3389,7 @@
       hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM\n"  );
    }
 
-   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP, 
+   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP,
                    pConfig->enableCloseLoop, NULL, eANI_BOOLEAN_FALSE)
        ==eHAL_STATUS_FAILURE)
    {
@@ -3376,7 +3397,7 @@
       hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CCM\n");
    }
 
-   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE, 
+   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE,
                    pConfig->enableAutomaticTxPowerControl, NULL, eANI_BOOLEAN_FALSE)
                    ==eHAL_STATUS_FAILURE)
    {
@@ -3384,7 +3405,7 @@
       hddLog(LOGE, "Could not pass on WNI_CFG_TX_PWR_CTRL_ENABLE to CCM\n");
    }
 
-   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_GI_40MHZ, 
+   if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_GI_40MHZ,
       pConfig->ShortGI40MhzEnable, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
    {
       fStatus = FALSE;
@@ -3392,7 +3413,7 @@
    }
 
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_MC_ADDR_LIST, pConfig->fEnableMCAddrList, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_MC_ADDR_LIST, pConfig->fEnableMCAddrList,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
@@ -3411,9 +3432,9 @@
            tANI_U32 temp = 0;
 
            ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, &temp);
-           temp = (temp & 0xFFFC) | pConfig->vhtRxMCS; 
+           temp = (temp & 0xFFFC) | pConfig->vhtRxMCS;
 
-           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, 
+           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_BASIC_MCS_SET,
                            temp, NULL, eANI_BOOLEAN_FALSE)
                ==eHAL_STATUS_FAILURE)
            {
@@ -3422,9 +3443,9 @@
            }
 
            ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP, &temp);
-           temp = (temp & 0xFFFC) | pConfig->vhtRxMCS; 
+           temp = (temp & 0xFFFC) | pConfig->vhtRxMCS;
 
-           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP, 
+           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP,
                            temp, NULL, eANI_BOOLEAN_FALSE)
                ==eHAL_STATUS_FAILURE)
            {
@@ -3433,9 +3454,9 @@
            }
 
            ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, &temp);
-           temp = (temp & 0xFFFC) | pConfig->vhtTxMCS; 
+           temp = (temp & 0xFFFC) | pConfig->vhtTxMCS;
 
-           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, 
+           if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP,
                            temp, NULL, eANI_BOOLEAN_FALSE)
                ==eHAL_STATUS_FAILURE)
            {
@@ -3446,14 +3467,14 @@
    }
 #endif
 
-     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_NUM_BUFF_ADVERT,pConfig->numBuffAdvert, 
+     if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_NUM_BUFF_ADVERT,pConfig->numBuffAdvert,
         NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE)
      {
         fStatus = FALSE;
         hddLog(LOGE, "Could not pass on WNI_CFG_NUM_BUFF_ADVERT to CCM\n");
      }
 
-     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HT_RX_STBC, 
+     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HT_RX_STBC,
                      pConfig->enableRxSTBC, NULL, eANI_BOOLEAN_FALSE)
          ==eHAL_STATUS_FAILURE)
      {
@@ -3464,7 +3485,7 @@
      ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO, (tANI_U32 *)&htCapInfo);
      htCapInfo.rxSTBC = pConfig->enableRxSTBC;
 
-     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO, 
+     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO,
                      *(tANI_U32 *)&htCapInfo, NULL, eANI_BOOLEAN_FALSE)
          ==eHAL_STATUS_FAILURE)
      {
@@ -3472,7 +3493,7 @@
          hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CCM\n");
      }
 
-     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_RXSTBC, 
+     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_RXSTBC,
                      pConfig->enableRxSTBC, NULL, eANI_BOOLEAN_FALSE)
          ==eHAL_STATUS_FAILURE)
      {
@@ -3491,14 +3512,14 @@
      {
             val = WNI_CFG_ASSOC_STA_LIMIT_STADEF;
      }
-     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ASSOC_STA_LIMIT, val, 
+     if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ASSOC_STA_LIMIT, val,
          NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
      {
          fStatus = FALSE;
          hddLog(LOGE,"Failure: Could not pass on WNI_CFG_ASSOC_STA_LIMIT configuration info to CCM\n"  );
      }
 #endif
-   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, 
+   if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION,
                    pConfig->enableLpwrImgTransition, NULL, eANI_BOOLEAN_FALSE)
        ==eHAL_STATUS_FAILURE)
    {
@@ -3524,14 +3545,14 @@
 
 /**---------------------------------------------------------------------------
 
-  \brief hdd_init_set_sme_config() - 
+  \brief hdd_init_set_sme_config() -
 
    This function initializes the sme configuration parameters
-   
+
   \param  - pHddCtx - Pointer to the HDD Adapter.
-              
+
   \return - 0 for success, non zero for failure
-    
+
   --------------------------------------------------------------------------*/
 
 VOS_STATUS hdd_set_sme_config( hdd_context_t *pHddCtx )
@@ -3544,7 +3565,7 @@
 
    vos_mem_zero( &smeConfig, sizeof( smeConfig ) );
 
-   VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, 
+   VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
               "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d\n", __func__,
               pConfig->WmmMode, pConfig->b80211eIsEnabled, pConfig->dot11Mode);
 
@@ -3576,11 +3597,13 @@
    smeConfig.csrConfig.vccRssiThreshold         = pConfig->nVccRssiTrigger;
    smeConfig.csrConfig.vccUlMacLossThreshold    = pConfig->nVccUlMacLossThreshold;
    smeConfig.csrConfig.nRoamingTime             = pConfig->nRoamingTime;
-   smeConfig.csrConfig.IsIdleScanEnabled        = pConfig->nEnableIdleScan; 
+   smeConfig.csrConfig.IsIdleScanEnabled        = pConfig->nEnableIdleScan;
    smeConfig.csrConfig.nActiveMaxChnTime        = pConfig->nActiveMaxChnTime;
    smeConfig.csrConfig.nActiveMinChnTime        = pConfig->nActiveMinChnTime;
    smeConfig.csrConfig.nPassiveMaxChnTime       = pConfig->nPassiveMaxChnTime;
    smeConfig.csrConfig.nPassiveMinChnTime       = pConfig->nPassiveMinChnTime;
+   smeConfig.csrConfig.nActiveMaxChnTimeBtc     = pConfig->nActiveMaxChnTimeBtc;
+   smeConfig.csrConfig.nActiveMinChnTimeBtc     = pConfig->nActiveMinChnTimeBtc;
 #ifdef WLAN_AP_STA_CONCURRENCY
    smeConfig.csrConfig.nActiveMaxChnTimeConc    = pConfig->nActiveMaxChnTimeConc;
    smeConfig.csrConfig.nActiveMinChnTimeConc    = pConfig->nActiveMinChnTimeConc;
@@ -3603,19 +3626,19 @@
     smeConfig.csrConfig.enableTxBF = pConfig->enableTxBF;
     smeConfig.csrConfig.txBFCsnValue = pConfig->txBFCsnValue;
 #endif
-   smeConfig.csrConfig.AdHocChannel5G            = 44; 
-   smeConfig.csrConfig.ProprietaryRatesEnabled   = 0;  
-   smeConfig.csrConfig.HeartbeatThresh50         = 40; 
-   smeConfig.csrConfig.bandCapability            = pConfig->nBandCapability; 
+   smeConfig.csrConfig.AdHocChannel5G            = 44;
+   smeConfig.csrConfig.ProprietaryRatesEnabled   = 0;
+   smeConfig.csrConfig.HeartbeatThresh50         = 40;
+   smeConfig.csrConfig.bandCapability            = pConfig->nBandCapability;
    if (pConfig->nBandCapability == eCSR_BAND_24)
    {
        smeConfig.csrConfig.Is11hSupportEnabled       = 0;
    } else {
        smeConfig.csrConfig.Is11hSupportEnabled       = pConfig->Is11hSupportEnabled;
    }
-   smeConfig.csrConfig.cbChoice                  = 0;   
-   smeConfig.csrConfig.bgScanInterval            = 0; 
-   smeConfig.csrConfig.eBand                     = pConfig->nBandCapability; 
+   smeConfig.csrConfig.cbChoice                  = 0;
+   smeConfig.csrConfig.bgScanInterval            = 0;
+   smeConfig.csrConfig.eBand                     = pConfig->nBandCapability;
    smeConfig.csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
    smeConfig.csrConfig.fEnableBypass11d          = pConfig->enableBypass11d;
    smeConfig.csrConfig.fEnableDFSChnlScan        = pConfig->enableDFSChnlScan;
@@ -3631,10 +3654,10 @@
 #endif
    smeConfig.csrConfig.Csr11dinfo.Channels.numChannels = 0;
 
-   //if there is a requirement that HDD will control the default channel list & 
-   //country code (say from .ini file) we need to add some logic here. Otherwise 
+   //if there is a requirement that HDD will control the default channel list &
+   //country code (say from .ini file) we need to add some logic here. Otherwise
    //the default 11d info should come from NV as per our current implementation
-   
+
 #ifdef WLAN_SOFTAP_FEATURE
    }
    else{
@@ -3650,7 +3673,7 @@
    hdd_set_power_save_config(pHddCtx, &smeConfig);
    hdd_set_btc_config(pHddCtx);
 
-#ifdef WLAN_FEATURE_VOWIFI_11R   
+#ifdef WLAN_FEATURE_VOWIFI_11R
    smeConfig.csrConfig.csr11rConfig.IsFTResourceReqSupported = pConfig->fFTResourceReqSupported;
 #endif
 #ifdef FEATURE_WLAN_LFR
@@ -3676,22 +3699,22 @@
 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
    smeConfig.csrConfig.neighborRoamConfig.nNeighborReassocRssiThreshold = pConfig->nNeighborReassocRssiThreshold;
    smeConfig.csrConfig.neighborRoamConfig.nNeighborLookupRssiThreshold = pConfig->nNeighborLookupRssiThreshold;
-   smeConfig.csrConfig.neighborRoamConfig.nNeighborScanMaxChanTime = pConfig->nNeighborScanMaxChanTime; 
-   smeConfig.csrConfig.neighborRoamConfig.nNeighborScanMinChanTime = pConfig->nNeighborScanMinChanTime; 
+   smeConfig.csrConfig.neighborRoamConfig.nNeighborScanMaxChanTime = pConfig->nNeighborScanMaxChanTime;
+   smeConfig.csrConfig.neighborRoamConfig.nNeighborScanMinChanTime = pConfig->nNeighborScanMinChanTime;
    smeConfig.csrConfig.neighborRoamConfig.nNeighborScanTimerPeriod = pConfig->nNeighborScanPeriod;
-   smeConfig.csrConfig.neighborRoamConfig.nMaxNeighborRetries = pConfig->nMaxNeighborReqTries; 
+   smeConfig.csrConfig.neighborRoamConfig.nMaxNeighborRetries = pConfig->nMaxNeighborReqTries;
    smeConfig.csrConfig.neighborRoamConfig.nNeighborResultsRefreshPeriod = pConfig->nNeighborResultsRefreshPeriod;
    smeConfig.csrConfig.neighborRoamConfig.nEmptyScanRefreshPeriod = pConfig->nEmptyScanRefreshPeriod;
-   hdd_string_to_u8_array( pConfig->neighborScanChanList, 
-                                        smeConfig.csrConfig.neighborRoamConfig.neighborScanChanList.channelList, 
-                                        &smeConfig.csrConfig.neighborRoamConfig.neighborScanChanList.numChannels, 
+   hdd_string_to_u8_array( pConfig->neighborScanChanList,
+                                        smeConfig.csrConfig.neighborRoamConfig.neighborScanChanList.channelList,
+                                        &smeConfig.csrConfig.neighborRoamConfig.neighborScanChanList.numChannels,
                                         WNI_CFG_VALID_CHANNEL_LIST_LEN );
 #endif
 
    smeConfig.csrConfig.addTSWhenACMIsOff = pConfig->AddTSWhenACMIsOff;
    smeConfig.csrConfig.fValidateList = pConfig->fValidateScanList;
 
-   //Enable/Disable MCC 
+   //Enable/Disable MCC
    smeConfig.csrConfig.fEnableMCCMode = pConfig->enableMCC;
    smeConfig.csrConfig.fAllowMCCGODiffBI = pConfig->allowMCCGODiffBI;
 
@@ -3700,14 +3723,14 @@
 
    smeConfig.csrConfig.enableTxLdpc = pConfig->enableTxLdpc;
 
-   halStatus = sme_UpdateConfig( pHddCtx->hHal, &smeConfig);    
+   halStatus = sme_UpdateConfig( pHddCtx->hHal, &smeConfig);
    if ( !HAL_STATUS_SUCCESS( halStatus ) )
    {
       status = VOS_STATUS_E_FAILURE;
    }
 
-   
-   return status;   
+
+   return status;
 }
 
 
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 1c7622c..1191299 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1022,6 +1022,8 @@
      * Values of 0xC0, 0x80 & 0x40 are to be used by
      * Roaming/application when 11d is enabled.
      */
+    tANI_U32 minChannelTimeBtc;    //in units of milliseconds
+    tANI_U32 maxChannelTimeBtc;    //in units of milliseconds
     tANI_U8              returnAfterFirstMatch;
 
     /**
@@ -3776,6 +3778,8 @@
 #define SIR_COEX_IND_DATA_SIZE (4)
 #define SIR_COEX_IND_TYPE_DISABLE_HB_MONITOR (0)
 #define SIR_COEX_IND_TYPE_ENABLE_HB_MONITOR (1)
+#define SIR_COEX_IND_TYPE_SCAN_COMPROMISED (2)
+#define SIR_COEX_IND_TYPE_SCAN_NOT_COMPROMISED (3)
 
 typedef struct sSirSmeCoexInd
 {
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index 0af14ae..89fb2e1 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -379,6 +379,8 @@
     tSirScanType       scanType;
     tANI_U32           minChannelTime;
     tANI_U32           maxChannelTime;
+    tANI_U32           minChannelTimeBtc;
+    tANI_U32           maxChannelTimeBtc;
     tSirBackgroundScanMode  backgroundScanMode;
     tANI_U32 dot11mode;
     /* Number of SSIDs to scan(send Probe request) */
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 21f4ad3..c8abd17 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1342,6 +1342,8 @@
         pMlmScanReq->backgroundScanMode = pScanReq->backgroundScanMode;
         pMlmScanReq->minChannelTime = pScanReq->minChannelTime;
         pMlmScanReq->maxChannelTime = pScanReq->maxChannelTime;
+        pMlmScanReq->minChannelTimeBtc = pScanReq->minChannelTimeBtc;
+        pMlmScanReq->maxChannelTimeBtc = pScanReq->maxChannelTimeBtc;
         pMlmScanReq->dot11mode = pScanReq->dot11mode;
 #ifdef WLAN_FEATURE_P2P
         pMlmScanReq->p2pSearch = pScanReq->p2pSearch;
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index a54ca44..7c46ef5 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1087,6 +1087,18 @@
                 if(pMac->lim.gpLimMlmScanReq)
                 {
                     val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->minChannelTime);
+                    if (pMac->btc.btcScanCompromise)
+                    {
+                        if (pMac->lim.gpLimMlmScanReq->minChannelTimeBtc)
+                        {
+                            val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->minChannelTimeBtc);
+                            limLog(pMac, LOG1, FL("Using BTC Min Active Scan time"));
+                        }
+                        else
+                        {
+                            limLog(pMac, LOGE, FL("BTC Active Scan Min Time is Not Set"));
+                        }
+                    }
                 }
                 else
                 {
@@ -1119,6 +1131,17 @@
             }
 
             val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->minChannelTime)/2;
+            if (pMac->btc.btcScanCompromise)
+            {
+               if (pMac->lim.gpLimMlmScanReq->minChannelTimeBtc)
+               {
+                   val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->minChannelTimeBtc)/2;
+               }
+               else
+               {
+                   limLog(pMac, LOGE, FL("BTC Active Scan Min Time is Not Set"));
+               }
+            }
             if (tx_timer_change(&pMac->lim.limTimers.gLimPeriodicProbeReqTimer,
                                 val, 0) != TX_SUCCESS)
             {
@@ -1161,6 +1184,18 @@
                     if(pMac->lim.gpLimMlmScanReq)
                     {
                         val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->maxChannelTime);
+                        if (pMac->btc.btcScanCompromise)
+                        {
+                            if (pMac->lim.gpLimMlmScanReq->maxChannelTimeBtc)
+                            {
+                                val = SYS_MS_TO_TICKS(pMac->lim.gpLimMlmScanReq->maxChannelTimeBtc);
+                                limLog(pMac, LOG1, FL("Using BTC Max Active Scan time"));
+                            }
+                            else
+                            {
+                                limLog(pMac, LOGE, FL("BTC Active Scan Max Time is Not Set"));
+                            }
+                        }
                     }
                     else
                     {
diff --git a/CORE/SME/inc/btcApi.h b/CORE/SME/inc/btcApi.h
index e236b95..e44e73e 100644
--- a/CORE/SME/inc/btcApi.h
+++ b/CORE/SME/inc/btcApi.h
@@ -368,6 +368,7 @@
    v_BOOL_t      fA2DPTrafStop;/*flag to check A2DP_STOP event has come before MODE_CHANGED*/
    v_U16_t       btcScoHandles[BT_MAX_SCO_SUPPORT];  /* Handles for SCO, if any*/
    v_BOOL_t      fA2DPUp;        /*remember whether A2DP is in session*/
+   v_BOOL_t      btcScanCompromise;
 } tSmeBtcInfo, *tpSmeBtcInfo;
 
 
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 9e82636..7ae38a8 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -39,13 +39,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
     \file csrApi.h
-  
+
     Exports and types for the Common Scan and Roaming Module interfaces.
-  
-    Copyright (C) 2006 Airgo Networks, Incorporated 
+
+    Copyright (C) 2006 Airgo Networks, Incorporated
    ========================================================================== */
 #ifndef CSRAPI_H__
 #define CSRAPI_H__
@@ -54,7 +54,7 @@
 #include "sirMacProtDef.h"
 #include "csrLinkList.h"
 
-typedef enum 
+typedef enum
 {
     eCSR_AUTH_TYPE_NONE,    //never used
     // MAC layer authentication types
@@ -88,7 +88,7 @@
 }eCsrAuthType;
 
 
-typedef enum 
+typedef enum
 {
     eCSR_ENCRYPT_TYPE_NONE,
     eCSR_ENCRYPT_TYPE_WEP40_STATICKEY,
@@ -197,7 +197,7 @@
     eCSR_SCAN_SUCCESS,
     eCSR_SCAN_FAILURE,
     eCSR_SCAN_ABORT,
-   eCSR_SCAN_FOUND_PEER,    
+   eCSR_SCAN_FOUND_PEER,
 }eCsrScanStatus;
 
 #define CSR_SCAN_TIME_DEFAULT       0
@@ -240,7 +240,7 @@
 #endif
 typedef struct tagCsrSSIDInfo
 {
-   tSirMacSSid     SSID;   
+   tSirMacSSid     SSID;
    tANI_BOOLEAN    handoffPermitted;
    tANI_BOOLEAN    ssidHidden;
 }tCsrSSIDInfo;
@@ -258,15 +258,17 @@
 }tCsrBSSIDs;
 
 
-typedef struct tagCsrScanRequest 
+typedef struct tagCsrScanRequest
 {
     tSirScanType scanType;
     tCsrBssid bssid;
     eCsrRoamBssType BSSType;
-    tCsrSSIDs SSIDs;   
+    tCsrSSIDs SSIDs;
     tCsrChannelInfo ChannelInfo;
     tANI_U32 minChnTime;    //in units of milliseconds
     tANI_U32 maxChnTime;    //in units of milliseconds
+    tANI_U32 minChnTimeBtc;    //in units of milliseconds
+    tANI_U32 maxChnTimeBtc;    //in units of milliseconds
     tANI_U32 restTime;      //in units of milliseconds  //ignored when not connected
     tANI_U32 uIEFieldLen;
     tANI_U8 *pIEField;
@@ -285,6 +287,8 @@
     tANI_U32 scanInterval;  //in units of milliseconds
     tANI_U32 minChnTime;    //in units of milliseconds
     tANI_U32 maxChnTime;    //in units of milliseconds
+    tANI_U32 minChnTimeBtc;    //in units of milliseconds
+    tANI_U32 maxChnTimeBtc;    //in units of milliseconds
     tANI_U32 restTime;      //in units of milliseconds  //ignored when not connected
     tANI_U32 throughputImpact;      //specify whether BG scan cares about impacting throughput  //ignored when not connected
     tCsrBssid bssid;    //how to use it?? Apple
@@ -337,19 +341,19 @@
 typedef struct tagCsrScanResultFilter
 {
     tCsrBSSIDs BSSIDs;    //each bssid has a length of WNI_CFG_BSSID_LEN (6)
-    tCsrSSIDs SSIDs;   
+    tCsrSSIDs SSIDs;
     tCsrChannelInfo ChannelInfo;
     tCsrAuthList authType;
     tCsrEncryptionList EncryptionType;
-    //eCSR_ENCRYPT_TYPE_ANY cannot be set in multicast encryption type. If caller doesn't case, 
+    //eCSR_ENCRYPT_TYPE_ANY cannot be set in multicast encryption type. If caller doesn't case,
     //put all supported encryption types in here
     tCsrEncryptionList mcEncryptionType;
-    eCsrRoamBssType BSSType;   
+    eCsrRoamBssType BSSType;
     //this is a bit mask of all the needed phy mode defined in eCsrPhyMode
-    tANI_U32 phyMode;   
+    tANI_U32 phyMode;
     //If countryCode[0] is not 0, countryCode is checked independent of fCheckUnknownCountryCode
-    tANI_U8 countryCode[WNI_CFG_COUNTRY_CODE_LEN]; 
-    tANI_U8 uapsd_mask; 
+    tANI_U8 countryCode[WNI_CFG_COUNTRY_CODE_LEN];
+    tANI_U8 uapsd_mask;
     /*For WPS filtering if true => auth and ecryption should be ignored*/
     tANI_BOOLEAN bWPSAssociation;
 #if defined WLAN_FEATURE_VOWIFI
@@ -391,34 +395,34 @@
 {
     eCSR_ROAM_CANCELLED = 1,
     //this mean error happens before association_start or roaming_start is called.
-    eCSR_ROAM_FAILED,   
+    eCSR_ROAM_FAILED,
     //a CSR trigger roaming operation starts, callback may get a pointer to tCsrConnectedProfile
-    eCSR_ROAM_ROAMING_START,    
+    eCSR_ROAM_ROAMING_START,
     //a CSR trigger roaming operation is completed
-    eCSR_ROAM_ROAMING_COMPLETION,   
+    eCSR_ROAM_ROAMING_COMPLETION,
     //Connection completed status.
-    eCSR_ROAM_CONNECT_COMPLETION, 
-    //an association or start_IBSS operation starts, 
-    //callback may get a pointer to tCsrRoamProfile and a pointer to tSirBssDescription 
-    eCSR_ROAM_ASSOCIATION_START,    
-    //a roaming operation is finish, see eCsrRoamResult for 
+    eCSR_ROAM_CONNECT_COMPLETION,
+    //an association or start_IBSS operation starts,
+    //callback may get a pointer to tCsrRoamProfile and a pointer to tSirBssDescription
+    eCSR_ROAM_ASSOCIATION_START,
+    //a roaming operation is finish, see eCsrRoamResult for
     //possible data passed back
-    eCSR_ROAM_ASSOCIATION_COMPLETION,   
+    eCSR_ROAM_ASSOCIATION_COMPLETION,
     eCSR_ROAM_DISASSOCIATED,
     eCSR_ROAM_ASSOCIATION_FAILURE,
     //when callback with this flag. callback gets a pointer to the BSS desc.
-    eCSR_ROAM_SHOULD_ROAM,  
+    eCSR_ROAM_SHOULD_ROAM,
     //A new candidate for PMKID is found
     eCSR_ROAM_SCAN_FOUND_NEW_BSS,
     //CSR is done lostlink roaming and still cannot reconnect
     eCSR_ROAM_LOSTLINK,
     //a link lost is detected. CSR starts roaming.
-    eCSR_ROAM_LOSTLINK_DETECTED,   
+    eCSR_ROAM_LOSTLINK_DETECTED,
     //TKIP MIC error detected, callback gets a pointer to tpSirSmeMicFailureInd
     eCSR_ROAM_MIC_ERROR_IND,
     eCSR_ROAM_IBSS_IND, //IBSS indications.
-    //Update the connection status, useful for IBSS: new peer added, network is active etc. 
-    eCSR_ROAM_CONNECT_STATUS_UPDATE,  
+    //Update the connection status, useful for IBSS: new peer added, network is active etc.
+    eCSR_ROAM_CONNECT_STATUS_UPDATE,
     eCSR_ROAM_GEN_INFO,
     eCSR_ROAM_SET_KEY_COMPLETE,
     eCSR_ROAM_REMOVE_KEY_COMPLETE,
@@ -448,7 +452,7 @@
     eCSR_ROAM_RESULT_MGMT_TX_COMPLETE_IND,
 #endif
     eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS, //Disaconnect all the clients
-    eCSR_ROAM_SEND_P2P_STOP_BSS, //Stopbss triggered from SME due to different 
+    eCSR_ROAM_SEND_P2P_STOP_BSS, //Stopbss triggered from SME due to different
                                  // beacon interval
 
 }eRoamCmdStatus;
@@ -460,9 +464,9 @@
     eCSR_ROAM_RESULT_NONE,
     //this means no more action in CSR
     //If roamStatus is eCSR_ROAM_ASSOCIATION_COMPLETION, tCsrRoamInfo's pBssDesc may pass back
-    eCSR_ROAM_RESULT_FAILURE,   
+    eCSR_ROAM_RESULT_FAILURE,
     //Pass back pointer to tCsrRoamInfo
-    eCSR_ROAM_RESULT_ASSOCIATED,    
+    eCSR_ROAM_RESULT_ASSOCIATED,
     eCSR_ROAM_RESULT_NOT_ASSOCIATED,
     eCSR_ROAM_RESULT_MIC_FAILURE,
     eCSR_ROAM_RESULT_FORCED,
@@ -471,27 +475,27 @@
     eCSR_ROAM_RESULT_CAP_CHANGED,
     //This means we starts an IBSS
     //tCsrRoamInfo's pBssDesc may pass back
-    eCSR_ROAM_RESULT_IBSS_STARTED,  
+    eCSR_ROAM_RESULT_IBSS_STARTED,
     //START_BSS failed
     //tCsrRoamInfo's pBssDesc may pass back
-    eCSR_ROAM_RESULT_IBSS_START_FAILED, 
+    eCSR_ROAM_RESULT_IBSS_START_FAILED,
     eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS,
-    eCSR_ROAM_RESULT_IBSS_JOIN_FAILED, 
+    eCSR_ROAM_RESULT_IBSS_JOIN_FAILED,
     eCSR_ROAM_RESULT_IBSS_CONNECT,
     eCSR_ROAM_RESULT_IBSS_INACTIVE,
     //If roamStatus is eCSR_ROAM_ASSOCIATION_COMPLETION
-    //tCsrRoamInfo's pBssDesc may pass back. and the peer's MAC address in peerMacOrBssid 
-    //If roamStatus is eCSR_ROAM_IBSS_IND,  
+    //tCsrRoamInfo's pBssDesc may pass back. and the peer's MAC address in peerMacOrBssid
+    //If roamStatus is eCSR_ROAM_IBSS_IND,
     //the peer's MAC address in peerMacOrBssid and a beacon frame of the IBSS in pbFrames
-    eCSR_ROAM_RESULT_IBSS_NEW_PEER, 
+    eCSR_ROAM_RESULT_IBSS_NEW_PEER,
     //Peer departed from IBSS, Callback may get a pointer tSmeIbssPeerInd in pIbssPeerInd
-    eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED, 
+    eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED,
     //Coalescing in the IBSS network (joined an IBSS network)
     //Callback pass a BSSID in peerMacOrBssid
-    eCSR_ROAM_RESULT_IBSS_COALESCED,    
+    eCSR_ROAM_RESULT_IBSS_COALESCED,
     //If roamStatus is eCSR_ROAM_ROAMING_START, callback may get a pointer to tCsrConnectedProfile used to connect.
-    eCSR_ROAM_RESULT_IBSS_STOP,  
-    eCSR_ROAM_RESULT_LOSTLINK, 
+    eCSR_ROAM_RESULT_IBSS_STOP,
+    eCSR_ROAM_RESULT_LOSTLINK,
     eCSR_ROAM_RESULT_MIC_ERROR_UNICAST,
     eCSR_ROAM_RESULT_MIC_ERROR_GROUP,
     eCSR_ROAM_RESULT_AUTHENTICATED,
@@ -507,7 +511,7 @@
     eCSR_ROAM_RESULT_WDS_STOPPED,
     // WDS joined successfully in STA mode
     eCSR_ROAM_RESULT_WDS_ASSOCIATED,
-    // A station joined WDS AP 
+    // A station joined WDS AP
     eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND,
     // WDS join failed in STA mode
     eCSR_ROAM_RESULT_WDS_NOT_ASSOCIATED,
@@ -573,7 +577,7 @@
     eCSR_DISCONNECT_REASON_IBSS_LEAVE,
 }eCsrRoamDisconnectReason;
 
-typedef enum 
+typedef enum
 {
     // Not associated in Infra or participating in an IBSS / Ad-hoc network.
     eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED,
@@ -600,7 +604,7 @@
 
 // This parameter is no longer supported in the Profile.  Need to set this in the global properties
 // for the adapter.
-typedef enum eCSR_MEDIUM_ACCESS 
+typedef enum eCSR_MEDIUM_ACCESS
 {
     eCSR_MEDIUM_ACCESS_AUTO = 0,
     eCSR_MEDIUM_ACCESS_DCF,
@@ -614,7 +618,7 @@
     eCSR_MEDIUM_ACCESS_11e_HCF  = eCSR_MEDIUM_ACCESS_HCF,
 }eCsrMediaAccessType;
 
-typedef enum 
+typedef enum
 {
     eCSR_TX_RATE_AUTO = 0,   // use rate adaption to determine Tx rate.
 
@@ -644,14 +648,14 @@
 
 }eCsrExposedTxRate;
 
-typedef enum 
+typedef enum
 {
     eCSR_OPERATING_CHANNEL_ALL  = 0,
     eCSR_OPERATING_CHANNEL_AUTO = eCSR_OPERATING_CHANNEL_ALL,
     eCSR_OPERATING_CHANNEL_ANY  = eCSR_OPERATING_CHANNEL_ALL,
 }eOperationChannel;
 
-typedef enum 
+typedef enum
 {
     eCSR_DOT11_FRAG_THRESH_AUTO            = -1,
     eCSR_DOT11_FRAG_THRESH_MIN             = 256,
@@ -661,7 +665,7 @@
 
 
 //for channel bonding for ibss
-typedef enum 
+typedef enum
 {
     eCSR_CB_OFF = 0,
     eCSR_CB_AUTO = 1,
@@ -677,7 +681,7 @@
 #define CSR_MAX_5GHz_CHANNEL_NUMBER  ( SIR_11A_CHANNEL_END )
 
 // WEP keysize (in bits)...
-typedef enum  
+typedef enum
 {
     eCSR_SECURITY_WEP_KEYSIZE_40  =  40,   // 40 bit key + 24bit IV = 64bit WEP
     eCSR_SECURITY_WEP_KEYSIZE_104 = 104,   // 104bit key + 24bit IV = 128bit WEP
@@ -702,7 +706,7 @@
 
 #define CSR_MAX_NUM_KEY     (eCSR_SECURITY_WEP_STATIC_KEY_ID_MAX + 1)
 
-typedef enum 
+typedef enum
 {
     eCSR_SECURITY_SET_KEY_ACTION_NO_CHANGE,
     eCSR_SECURITY_SET_KEY_ACTION_SET_KEY,
@@ -718,17 +722,17 @@
 }eCsrBand;
 
 
-typedef enum 
+typedef enum
 {
-   // Roaming because HDD requested for reassoc by changing one of the fields in 
+   // Roaming because HDD requested for reassoc by changing one of the fields in
    // tCsrRoamModifyProfileFields. OR
-   // Roaming because SME requested for reassoc by changing one of the fields in 
+   // Roaming because SME requested for reassoc by changing one of the fields in
    // tCsrRoamModifyProfileFields.
    eCsrRoamReasonStaCapabilityChanged,
-   // Roaming because SME requested for reassoc to a different AP, as part of 
+   // Roaming because SME requested for reassoc to a different AP, as part of
    // inter AP handoff.
    eCsrRoamReasonBetterAP,
-   // Roaming because SME requested it as the link is lost - placeholder, will 
+   // Roaming because SME requested it as the link is lost - placeholder, will
    // clean it up once handoff code gets in
    eCsrRoamReasonSmeIssuedForLostLink,
 
@@ -783,14 +787,14 @@
     tANI_U8 defaultIndex;
 }tCsrKeys;
 
-/* Following are fields which are part of tCsrRoamConnectedProfile might need 
+/* Following are fields which are part of tCsrRoamConnectedProfile might need
    modification dynamically once STA is up & running and this could trigger
    reassoc */
 typedef struct tagCsrRoamModifyProfileFields
 {
-   // during connect this specifies ACs U-APSD is to be setup 
+   // during connect this specifies ACs U-APSD is to be setup
    //   for (Bit0:VO; Bit1:VI; Bit2:BK; Bit3:BE all other bits are ignored).
-   //  During assoc response this COULD carry confirmation of what ACs U-APSD 
+   //  During assoc response this COULD carry confirmation of what ACs U-APSD
    // got setup for. Later if an APP looking for APSD, SME-QoS might need to
    // modify this field
    tANI_U8     uapsd_mask;
@@ -815,21 +819,21 @@
     //This field is for output only, not for input
     eCsrEncryptionType negotiatedUCEncryptionType;
 
-    //eCSR_ENCRYPT_TYPE_ANY cannot be set in multicast encryption type. If caller doesn't case, 
+    //eCSR_ENCRYPT_TYPE_ANY cannot be set in multicast encryption type. If caller doesn't case,
     //put all supported encryption types in here
     tCsrEncryptionList mcEncryptionType;
     //This field is for output only, not for input
-    eCsrEncryptionType negotiatedMCEncryptionType;  
+    eCsrEncryptionType negotiatedMCEncryptionType;
 
     tCsrKeys Keys;
     eCsrCBChoice CBMode; //up, down or auto
     tCsrChannelInfo ChannelInfo;
-    tANI_U8 operationChannel;   
+    tANI_U8 operationChannel;
     tANI_U16 beaconInterval;    //If this is 0, SME will fill in for caller.
-    // during connect this specifies ACs U-APSD is to be setup 
+    // during connect this specifies ACs U-APSD is to be setup
     //   for (Bit0:VO; Bit1:VI; Bit2:BK; Bit3:BE all other bits are ignored).
     //  During assoc response this COULD carry confirmation of what ACs U-APSD got setup for
-    tANI_U8 uapsd_mask; 
+    tANI_U8 uapsd_mask;
     tANI_U32 nWPAReqIELength;   //The byte count in the pWPAReqIE
     tANI_U8 *pWPAReqIE;   //If not null, it has the IE byte stream for WPA
     tANI_U32 nRSNReqIELength;  //The byte count in the pRSNReqIE
@@ -841,7 +845,7 @@
 
     tANI_U32 nAddIEScanLength;   //The byte count in the pAddIE for scan (at the time of join)
     tANI_U8 *pAddIEScan;       //If not null, it has the IE byte stream for additional IE, which can be WSC IE and/or P2P IE
-    tANI_U32 nAddIEAssocLength;   //The byte count in the pAddIE for assoc 
+    tANI_U32 nAddIEAssocLength;   //The byte count in the pAddIE for assoc
     tANI_U8 *pAddIEAssoc;       //If not null, it has the IE byte stream for additional IE, which can be WSC IE and/or P2P IE
 
     tANI_U8 countryCode[WNI_CFG_COUNTRY_CODE_LEN];  //it is ignored if [0] is 0.
@@ -890,23 +894,23 @@
     tCsrKeys Keys;
     // meaningless on connect. It's an OUT param from CSR's point of view
     // During assoc response carries the ACM bit-mask i.e. what
-    // ACs have ACM=1 (if any), 
+    // ACs have ACM=1 (if any),
     // (Bit0:VO; Bit1:VI; Bit2:BK; Bit3:BE all other bits are ignored)
     tANI_U8  acm_mask;
     tCsrRoamModifyProfileFields modifyProfileFields;
     tANI_U32 nAddIEAssocLength;   //The byte count in the pAddIE for assoc
     tANI_U8 *pAddIEAssoc;       //If not null, it has the IE byte stream for additional IE, which can be WSC IE and/or P2P IE
-    
-    tSirBssDescription *pBssDesc;   
+
+    tSirBssDescription *pBssDesc;
     tANI_BOOLEAN   qap; //AP supports QoS
     tANI_BOOLEAN   qosConnection; //A connection is QoS enabled
 #ifdef WLAN_FEATURE_VOWIFI_11R
     tCsrMobilityDomainInfo MDID;
 #endif
-    
+
 #ifdef FEATURE_WLAN_CCX
     tCsrCcxCckmInfo ccxCckmInfo;
-    tANI_BOOLEAN    isCCXAssoc; 
+    tANI_BOOLEAN    isCCXAssoc;
 #endif
 }tCsrRoamConnectedProfile;
 
@@ -970,21 +974,21 @@
                                //at the moment, this flag is provided only to pass Wi-Fi Cert. 5.1.12
     tCsr11dinfo  Csr11dinfo;
     //Whether to limit the channels to the ones set in Csr11dInfo. If true, the opertaional
-    //channels are limited to the default channel list. It is an "AND" operation between the 
+    //channels are limited to the default channel list. It is an "AND" operation between the
     //default channels and the channels in the 802.11d IE.
-    tANI_BOOLEAN fEnforce11dChannels;  
+    tANI_BOOLEAN fEnforce11dChannels;
     //Country Code Priority
-    //0 = 802.11D > Country IOCTL > NV 
+    //0 = 802.11D > Country IOCTL > NV
     //1 = Country IOCTL > 802.11D > NV
     tANI_BOOLEAN fSupplicantCountryCodeHasPriority;
-    //When true, AP with unknown country code won't be see. 
-    //"Unknown country code" means either Ap doesn't have 11d IE or we cannot 
-    //find a domain for the country code in its 11d IE. 
-    tANI_BOOLEAN fEnforceCountryCodeMatch;  
+    //When true, AP with unknown country code won't be see.
+    //"Unknown country code" means either Ap doesn't have 11d IE or we cannot
+    //find a domain for the country code in its 11d IE.
+    tANI_BOOLEAN fEnforceCountryCodeMatch;
     //When true, only APs in the default domain can be seen. If the Ap has "unknown country
     //code", or the domain of the country code doesn't match the default domain, the Ap is
     //not acceptable.
-    tANI_BOOLEAN fEnforceDefaultDomain;     
+    tANI_BOOLEAN fEnforceDefaultDomain;
 
     tANI_U16 vccRssiThreshold;
     tANI_U32 vccUlMacLossThreshold;
@@ -993,6 +997,9 @@
     tANI_U32  nPassiveMaxChnTime;    //in units of milliseconds
     tANI_U32  nActiveMinChnTime;     //in units of milliseconds
     tANI_U32  nActiveMaxChnTime;     //in units of milliseconds
+
+    tANI_U32  nActiveMinChnTimeBtc;     //in units of milliseconds
+    tANI_U32  nActiveMaxChnTimeBtc;     //in units of milliseconds
 #ifdef WLAN_AP_STA_CONCURRENCY
     tANI_U32  nPassiveMinChnTimeConc;    //in units of milliseconds
     tANI_U32  nPassiveMaxChnTimeConc;    //in units of milliseconds
@@ -1005,9 +1012,9 @@
 
     tANI_BOOLEAN IsIdleScanEnabled;
     //in dBm, the maximum TX power
-    //The actual TX power is the lesser of this value and 11d. 
+    //The actual TX power is the lesser of this value and 11d.
     //If 11d is disable, the lesser of this and default setting.
-    tANI_U8 nTxPowerCap;     
+    tANI_U8 nTxPowerCap;
     tANI_U32  statsReqPeriodicity;  //stats request frequency from PE while in full power
     tANI_U32  statsReqPeriodicityInPS;//stats request frequency from PE while in power save
 #ifdef WLAN_FEATURE_VOWIFI_11R
@@ -1030,12 +1037,12 @@
     tCsrNeighborRoamConfigParams    neighborRoamConfig;
 #endif
 
-    /* Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC 
+    /* Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC
      * This is mandated by WMM-AC certification */
     tANI_BOOLEAN addTSWhenACMIsOff;
 
-    
-    /*channelPowerInfoList24 has been seen corrupted. Set this flag to true trying to 
+
+    /*channelPowerInfoList24 has been seen corrupted. Set this flag to true trying to
     * detect when it happens. Adding this into code because we can't reproduce it easily.
     * We don't know when it happens. */
     tANI_BOOLEAN fValidateList;
@@ -1046,8 +1053,8 @@
     * to determine the country code & domain */
     tANI_BOOLEAN fEnableBypass11d;
 
-    /*Customer wants to optimize the scan time. Avoiding scans(passive) on DFS 
-    * channels while swipping through both bands can save some time 
+    /*Customer wants to optimize the scan time. Avoiding scans(passive) on DFS
+    * channels while swipping through both bands can save some time
     * (apprx 1.3 sec) */
     tANI_BOOLEAN fEnableDFSChnlScan;
 
@@ -1072,7 +1079,7 @@
     tANI_U8 scanCfgAgingTime;
 
     tANI_U8   enableTxLdpc;
-}tCsrConfigParam;   
+}tCsrConfigParam;
 
 //Tush
 typedef struct tagCsrUpdateConfigParam
@@ -1095,13 +1102,13 @@
     tANI_BOOLEAN fReassocReq;   //set to true if for re-association
     tANI_BOOLEAN fReassocRsp;   //set to true if for re-association
     tCsrBssid bssid;
-    //Only valid in IBSS 
+    //Only valid in IBSS
     //this is the peers MAC address for eCSR_ROAM_RESULT_IBSS_NEW_PEER or PEER_DEPARTED
-    tCsrBssid peerMac;  
+    tCsrBssid peerMac;
     tSirResultCodes statusCode;
     tANI_U32 reasonCode;    //this could be our own defined or sent from the other BSS(per 802.11 spec)
     tANI_U8  staId;         // Peer stationId when connected
-    /*The DPU signatures will be sent eventually to TL to help it determine the 
+    /*The DPU signatures will be sent eventually to TL to help it determine the
       association to which a packet belongs to*/
     /*Unicast DPU signature*/
     tANI_U8            ucastSig;
@@ -1116,7 +1123,7 @@
 
     tANI_U8 addIELen;
     tANI_U8 *paddIE;
-    
+
     union
     {
         tSirMicFailureInfo *pMICFailureInfo;
@@ -1135,7 +1142,7 @@
     tANI_BOOLEAN isCCXAssoc;
 #endif
 #ifdef WLAN_FEATURE_P2P
-    void* pRemainCtx; 
+    void* pRemainCtx;
     tANI_U32 rxChan;
 #endif
 
@@ -1147,7 +1154,7 @@
     tANI_U32 beaconLength;
     tANI_U8* beaconPtr;
     tANI_U32 assocReqLength;
-    tANI_U8* assocReqPtr;    
+    tANI_U8* assocReqPtr;
 
     tANI_S8 rxRssi;
 }tCsrRoamInfo;
@@ -1345,7 +1352,7 @@
 
 //void *p2 -- the second context pass in for the caller
 //***what if callback is called before requester gets the scanId??
-typedef eHalStatus (*csrScanCompleteCallback)(tHalHandle, void *p2, tANI_U32 scanID, eCsrScanStatus status);   
+typedef eHalStatus (*csrScanCompleteCallback)(tHalHandle, void *p2, tANI_U32 scanID, eCsrScanStatus status);
 
 
 
@@ -1357,10 +1364,10 @@
 //roamId is to identify the callback related roam request. 0 means unsolicit
 //roamStatus is a flag indicating the status of the callback
 //roamResult is the result
-typedef eHalStatus (*csrRoamCompleteCallback)(void *pContext, tCsrRoamInfo *pParam, tANI_U32 roamId, 
+typedef eHalStatus (*csrRoamCompleteCallback)(void *pContext, tCsrRoamInfo *pParam, tANI_U32 roamId,
                                               eRoamCmdStatus roamStatus, eCsrRoamResult roamResult);
 
-typedef eHalStatus (*csrRoamSessionCloseCallback)(void *pContext);   
+typedef eHalStatus (*csrRoamSessionCloseCallback)(void *pContext);
 
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetNumPMKIDCache
@@ -1372,7 +1379,7 @@
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetPMKIDCache
     \brief return PMKID cache from CSR
-    \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the 
+    \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the
     needed or actually number in tPmkidCacheInfo.
     \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
@@ -1409,10 +1416,10 @@
 #ifdef WLAN_SOFTAP_FEATURE
 /* ---------------------------------------------------------------------------
     \fn csrSetChannels
-    \brief HDD calls this function to change some global settings. 
+    \brief HDD calls this function to change some global settings.
     caller must set the all fields or call csrGetConfigParam to prefill the fields.
     \param pParam - caller allocated memory
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 
 eHalStatus csrSetChannels(tHalHandle hHal,  tCsrConfigParam *pParam  );
@@ -1429,12 +1436,12 @@
     \brief HDD calls this function to set the phyMode.
     This function must be called after CFG is downloaded and all the band/mode setting already passed into
     CSR.
-    \param phyMode - indicate the phyMode needs to set to. The value has to be either 0, or some bits set. 
+    \param phyMode - indicate the phyMode needs to set to. The value has to be either 0, or some bits set.
     See eCsrPhyMode for definition
     \param eBand - specify the operational band (2.4, 5 or both)
-    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether 
+    \param pfRestartNeeded - pointer to a caller allocated space. Upon successful return, it indicates whether
     a restart is needed to apply the change
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrSetPhyMode(tHalHandle hHal, tANI_U32 phyMode, eCsrBand eBand, tANI_BOOLEAN *pfRestartNeeded);
 
@@ -1444,7 +1451,7 @@
 /*---------------------------------------------------------------------------
   This is the type for a link quality callback to be registered with SME
   for indications
-  Once the link quality has been indicated, subsequently, link indications are 
+  Once the link quality has been indicated, subsequently, link indications are
   posted each time there is a CHANGE in link quality.
   *** If there is no change in link, there will be no indication ***
 
@@ -1452,9 +1459,9 @@
   such as RSSI and PER.
 
   \param ind - Indication being posted
-  \param pContext - any user data given at callback registration.  
+  \param pContext - any user data given at callback registration.
   \return None
-  
+
 ---------------------------------------------------------------------------*/
 typedef void (* csrRoamLinkQualityIndCallback)
              (eCsrRoamLinkQualityInd  ind, void *pContext);
@@ -1464,15 +1471,15 @@
   This is the type for a statistics callback to be registered with SME
   for stats reporting
 
-  Since the client requesting for the stats already know which class/type of 
-  stats it asked for, the callback will carry them in the rsp buffer 
-  (void * stats) whose size will be same as the size of requested stats & 
+  Since the client requesting for the stats already know which class/type of
+  stats it asked for, the callback will carry them in the rsp buffer
+  (void * stats) whose size will be same as the size of requested stats &
   will be exactly in the same order requested in the stats mask from LSB to MSB
 
   \param stats - stats rsp buffer sent back with the report
-  \param pContext - any user data given at callback registration.  
+  \param pContext - any user data given at callback registration.
   \return None
-  
+
 ---------------------------------------------------------------------------*/
 typedef void ( *tCsrStatsCallback) (void * stats, void *pContext);
 
@@ -1481,9 +1488,9 @@
   for getting rssi
 
   \param rssi - rssi
-  \param pContext - any user data given at callback registration.  
+  \param pContext - any user data given at callback registration.
   \return None
-  
+
 ---------------------------------------------------------------------------*/
 
 typedef void ( *tCsrRssiCallback) (v_S7_t rssi, tANI_U32 staId, void *pContext);
@@ -1493,12 +1500,12 @@
 #endif
 
 /*---------------------------------------------------------------------------
-  This is the function to change the Band configuraiton (ALL/2.4 GHZ/5 GHZ) 
+  This is the function to change the Band configuraiton (ALL/2.4 GHZ/5 GHZ)
 
-  \param hHal - handle to Hal context 
+  \param hHal - handle to Hal context
   \param eBand - band value
   \return  eHalStatus
-  
+
 ---------------------------------------------------------------------------*/
 eHalStatus csrSetBand(tHalHandle hHal, eCsrBand eBand);
 
@@ -1506,7 +1513,7 @@
   This is the function to get the current operating band value
   \param hHal - handl to Hal context
   \return eCsrband - band value
-  
+
 ---------------------------------------------------------------------------*/
 eCsrBand csrGetCurrentBand (tHalHandle hHal);
 
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index c91b76c..0c0ab82 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -39,15 +39,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/** ------------------------------------------------------------------------- * 
-    ------------------------------------------------------------------------- *  
+/** ------------------------------------------------------------------------- *
+    ------------------------------------------------------------------------- *
 
-  
+
     \file csrInternal.h
-  
+
     Define internal data structure for MAC.
-  
-    Copyright (C) 2006 Airgo Networks, Incorporated 
+
+    Copyright (C) 2006 Airgo Networks, Incorporated
    ========================================================================== */
 #ifndef CSRINTERNAL_H__
 #define CSRINTERNAL_H__
@@ -110,39 +110,39 @@
 {
     //eCSR_CFG_DOT11_MODE_BEST = 0,
     eCSR_CFG_DOT11_MODE_TAURUS = 0,
-    eCSR_CFG_DOT11_MODE_ABG,    
-    eCSR_CFG_DOT11_MODE_11A,    
-    eCSR_CFG_DOT11_MODE_11B,    
-    eCSR_CFG_DOT11_MODE_11G,    
-    eCSR_CFG_DOT11_MODE_11N,   
-    eCSR_CFG_DOT11_MODE_POLARIS,    
-    eCSR_CFG_DOT11_MODE_TITAN,    
+    eCSR_CFG_DOT11_MODE_ABG,
+    eCSR_CFG_DOT11_MODE_11A,
+    eCSR_CFG_DOT11_MODE_11B,
+    eCSR_CFG_DOT11_MODE_11G,
+    eCSR_CFG_DOT11_MODE_11N,
+    eCSR_CFG_DOT11_MODE_POLARIS,
+    eCSR_CFG_DOT11_MODE_TITAN,
 #ifdef WLAN_FEATURE_11AC
     eCSR_CFG_DOT11_MODE_11AC,
 #endif
 #ifdef WLAN_SOFTAP_FEATURE
-    eCSR_CFG_DOT11_MODE_11G_ONLY,    
-    eCSR_CFG_DOT11_MODE_11N_ONLY,   
-#endif 
+    eCSR_CFG_DOT11_MODE_11G_ONLY,
+    eCSR_CFG_DOT11_MODE_11N_ONLY,
+#endif
 #ifdef WLAN_FEATURE_11AC
     eCSR_CFG_DOT11_MODE_11AC_ONLY,
-#endif 
+#endif
     //This value can never set to CFG. It is for CSR's internal use
     eCSR_CFG_DOT11_MODE_AUTO,
 }eCsrCfgDot11Mode;  //Used to determine what to set to the WNI_CFG_DOT11_MODE
 
-typedef enum etCsrRoamCommands 
+typedef enum etCsrRoamCommands
 {
-    eCsrRoamNoCommand,                 
+    eCsrRoamNoCommand,
     eCsrRoamCommandScan,
-    eCsrRoamCommandRoam, 
-    eCsrRoamCommandWmStatusChange, 
+    eCsrRoamCommandRoam,
+    eCsrRoamCommandWmStatusChange,
     eCsrRoamCommandSetKey,
     eCsrRoamCommandRemoveKey,
 
 } eCsrRoamCommands;
 
-typedef enum  
+typedef enum
 {
     eCsrScanOther = 1,
     eCsrScanLostLink1,
@@ -166,17 +166,17 @@
     eCsrScanProbeBss, // directed probe on an entry from the candidate list - HO
     eCsrScanAbortBgScan,    //aborting a BG scan (meaning the scan is triggered by LIM timer)
     eCsrScanAbortNormalScan, //aborting a normal scan (the scan is trigger by eWNI_SME_SCAN_REQ)
-    eCsrScanP2PFindPeer    
+    eCsrScanP2PFindPeer
 }eCsrScanReason;
 
-typedef enum 
+typedef enum
 {
     eCsrNoConnection,          // Roaming because we have not established the initial connection.
     eCsrCapsChange,            // roaming because LIM reported a Capability change in the associated AP.
     eCsrForcedDisassoc,        // roaming becuase someone asked us to Disassoc and stay disassociated.
     eCsrHddIssued,             // roaming because an 802.11 request was issued to the driver.
     eCsrLostLink1,             // roaming because we lost link to an associated AP
-    eCsrLostLink2, 
+    eCsrLostLink2,
     eCsrLostLink3,
     eCsrForcedDisassocMICFailure, // roaming because we need to force a Disassoc due to MIC failure
     eCsrHddIssuedReassocToSameAP,
@@ -192,24 +192,24 @@
     eCsrForcedDisassocSta,
     eCsrForcedDeauthSta,
     eCsrPerformPreauth,
-    
+
 }eCsrRoamReason;
 
 typedef enum
 {
-    eCSR_ROAM_SUBSTATE_NONE = 0,                 
-    eCSR_ROAM_SUBSTATE_START_BSS_REQ,            
-    eCSR_ROAM_SUBSTATE_JOIN_REQ,                 
-    eCSR_ROAM_SUBSTATE_REASSOC_REQ,              
-    eCSR_ROAM_SUBSTATE_DISASSOC_REQ,             
-    eCSR_ROAM_SUBSTATE_STOP_BSS_REQ,             
-    eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING,   //Continue the current roam command after disconnect            
-    eCSR_ROAM_SUBSTATE_AUTH_REQ,                 
-    eCSR_ROAM_SUBSTATE_CONFIG,                   
-    eCSR_ROAM_SUBSTATE_DEAUTH_REQ,               
-    eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN, 
-    eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, 
-    eCSR_ROAM_SUBSTATE_DISASSOC_FORCED,          
+    eCSR_ROAM_SUBSTATE_NONE = 0,
+    eCSR_ROAM_SUBSTATE_START_BSS_REQ,
+    eCSR_ROAM_SUBSTATE_JOIN_REQ,
+    eCSR_ROAM_SUBSTATE_REASSOC_REQ,
+    eCSR_ROAM_SUBSTATE_DISASSOC_REQ,
+    eCSR_ROAM_SUBSTATE_STOP_BSS_REQ,
+    eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING,   //Continue the current roam command after disconnect
+    eCSR_ROAM_SUBSTATE_AUTH_REQ,
+    eCSR_ROAM_SUBSTATE_CONFIG,
+    eCSR_ROAM_SUBSTATE_DEAUTH_REQ,
+    eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN,
+    eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE,
+    eCSR_ROAM_SUBSTATE_DISASSOC_FORCED,
     eCSR_ROAM_SUBSTATE_WAIT_FOR_KEY,
     eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF,
     eCSR_ROAM_SUBSTATE_JOINED_NO_TRAFFIC,
@@ -219,7 +219,7 @@
 } eCsrRoamSubState;
 
 
-typedef enum 
+typedef enum
 {
   eCSR_ROAMING_STATE_STOP = 0,
   eCSR_ROAMING_STATE_IDLE,
@@ -229,7 +229,7 @@
 }eCsrRoamState;
 
 
-typedef enum 
+typedef enum
 {
     eCsrContinueRoaming,
     eCsrStopRoaming,
@@ -237,7 +237,7 @@
     eCsrStartIbssSameIbss,
     eCsrReassocToSelfNoCapChange,
     eCsrStopRoamingDueToConcurrency,
-    
+
 }eCsrJoinState;
 
 typedef enum
@@ -249,7 +249,7 @@
    eCsrReassocRoaming,
 }eCsrRoamingReason;
 
-typedef enum 
+typedef enum
 {
     eCsrDisassociated,
     eCsrDeauthenticated
@@ -372,8 +372,8 @@
     tVOS_CON_MODE       bssPersona;
     tANI_U16            nRSNIELength;  //The byte count in the pRSNIE, if 0, pRSNIE is ignored.
     tANI_U8             *pRSNIE;     //If not null, it has the IE byte stream for RSN
-    tANI_BOOLEAN        updatebeaconInterval; //Flag used to indicate update 
-                                             // beaconInterval 
+    tANI_BOOLEAN        updatebeaconInterval; //Flag used to indicate update
+                                             // beaconInterval
 }tCsrRoamStartBssParams;
 
 
@@ -393,21 +393,21 @@
     }u;
 }tScanCmd;
 
-typedef struct tagRoamCmd 
+typedef struct tagRoamCmd
 {
     tANI_U32 roamId;
     eCsrRoamReason roamReason;
     tCsrRoamProfile roamProfile;
     tScanResultHandle hBSSList;     //BSS list fits the profile
-    tListElem *pRoamBssEntry;  //point to the current BSS in the list that is roaming. It starts from head to tail        
+    tListElem *pRoamBssEntry;  //point to the current BSS in the list that is roaming. It starts from head to tail
     tSirBssDescription *pLastRoamBss;   //the last BSS we try and failed
-    tANI_BOOLEAN fReleaseBssList;  //whether to free hBSSList 
+    tANI_BOOLEAN fReleaseBssList;  //whether to free hBSSList
     tANI_BOOLEAN fReleaseProfile;  //whether to free roamProfile
     tANI_BOOLEAN fReassoc;  //whether this command is for reassociation
     tANI_BOOLEAN fUpdateCurRoamProfile;     //whether pMac->roam.pCurRoamProfile needs to be updated
     //this is for CSR internal used only. And it should not be assigned when creating the command
     //This causes the roam command not to do anything.
-    tANI_BOOLEAN fReassocToSelfNoCapChange;    
+    tANI_BOOLEAN fReassocToSelfNoCapChange;
 
     tANI_BOOLEAN fStopWds;
     tSirMacAddr peerMac;
@@ -437,14 +437,14 @@
     tANI_U8 keyId;  //key index
 } tRemoveKeyCmd;
 
-typedef struct tagWmStatusChangeCmd 
+typedef struct tagWmStatusChangeCmd
 {
     eCsrRoamWmStatusChangeTypes Type;
-    union 
-    {    
+    union
+    {
         tSirSmeDeauthInd   DeauthIndMsg;
         tSirSmeDisassocInd DisassocIndMsg;
-    }u;    
+    }u;
 
 }tWmStatusChangeCmd;
 
@@ -539,21 +539,21 @@
     tANI_U8 bCatRssiOffset;     //to set the RSSI difference for each category
     tANI_U32 nRoamingTime;  //In seconds, CSR will try this long before gives up, 0 means no roaming
     //Whether to limit the channels to the ones set in Csr11dInfo. If true, the opertaional
-    //channels are limited to the default channel list. It is an "AND" operation between the 
+    //channels are limited to the default channel list. It is an "AND" operation between the
     //default channels and the channels in the 802.11d IE.
-    tANI_BOOLEAN fEnforce11dChannels;   
+    tANI_BOOLEAN fEnforce11dChannels;
     //Country Code Priority
-    //0 = 802.11D > Configured Country > NV 
+    //0 = 802.11D > Configured Country > NV
     //1 = Configured Country > 802.11D > NV
     tANI_BOOLEAN fSupplicantCountryCodeHasPriority;
-    //When true, AP with unknown country code won't be see. 
-    //"Unknown country code" means either Ap doesn't have 11d IE or we cannot 
+    //When true, AP with unknown country code won't be see.
+    //"Unknown country code" means either Ap doesn't have 11d IE or we cannot
     //find a domain for the country code in its 11d IE.
-    tANI_BOOLEAN fEnforceCountryCodeMatch;  
+    tANI_BOOLEAN fEnforceCountryCodeMatch;
     //When true, only APs in the default domain can be seen. If the Ap has "unknown country
     //code", or the doamin of the country code doesn't match the default domain, the Ap is
     //not acceptable.
-    tANI_BOOLEAN fEnforceDefaultDomain;     
+    tANI_BOOLEAN fEnforceDefaultDomain;
 
     tANI_U16 vccRssiThreshold;
     tANI_U32 vccUlMacLossThreshold;
@@ -562,6 +562,9 @@
     tANI_U32  nPassiveMaxChnTime;    //in units of milliseconds
     tANI_U32  nActiveMinChnTime;     //in units of milliseconds
     tANI_U32  nActiveMaxChnTime;     //in units of milliseconds
+
+    tANI_U32  nActiveMinChnTimeBtc;     //in units of milliseconds
+    tANI_U32  nActiveMaxChnTimeBtc;     //in units of milliseconds
 #ifdef WLAN_AP_STA_CONCURRENCY
     tANI_U32  nPassiveMinChnTimeConc;    //in units of milliseconds
     tANI_U32  nPassiveMaxChnTimeConc;    //in units of milliseconds
@@ -574,7 +577,7 @@
 
     tANI_BOOLEAN IsIdleScanEnabled;
     //in dBm, the maximum TX power
-    //The actual TX power is the lesser of this value and 11d. 
+    //The actual TX power is the lesser of this value and 11d.
     //If 11d is disable, the lesser of this and default setting.
     tANI_U8 nTxPowerCap;
     tANI_U32  statsReqPeriodicity;  //stats request frequency from PE while in full power
@@ -607,12 +610,12 @@
     tCsrNeighborRoamConfig neighborRoamConfig;
 #endif
 
-    /* Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC 
+    /* Instead of Reassoc, send ADDTS/DELTS even when ACM is off for that AC
      * This is mandated by WMM-AC certification */
     tANI_BOOLEAN addTSWhenACMIsOff;
 
     tANI_BOOLEAN fValidateList;
-    //Remove this code once SLM_Sessionization is supported 
+    //Remove this code once SLM_Sessionization is supported
     //BMPS_WORKAROUND_NOT_NEEDED
     tANI_BOOLEAN doBMPSWorkaround;
 
@@ -627,7 +630,7 @@
 
 }tCsrConfig;
 
-typedef struct tagCsrChannelPowerInfo 
+typedef struct tagCsrChannelPowerInfo
 {
     tListElem link;
     tANI_U8 firstChannel;
@@ -640,7 +643,7 @@
 {
     tSirResultCodes statusCode;
     //this is set to unspecified if statusCode indicates timeout. Or it is the failed reason from the other BSS(per 802.11 spec)
-    tANI_U32 reasonCode;    
+    tANI_U32 reasonCode;
 }tCsrRoamJoinStatus;
 
 typedef struct tagCsrOsChannelMask
@@ -671,9 +674,9 @@
     tANI_U8 channelOf11dInfo;
     tANI_U8 scanResultCfgAgingTime;
     //changes on every scan, a flag to tell whether conflict 11d info found on each BSS
-    tANI_BOOLEAN fAmbiguous11dInfoFound;    
+    tANI_BOOLEAN fAmbiguous11dInfoFound;
     //Tush: changes on every scan, a flag to tell whether the applied 11d info present in one of the scan results
-    tANI_BOOLEAN fCurrent11dInfoMatch;    
+    tANI_BOOLEAN fCurrent11dInfoMatch;
     tANI_BOOLEAN f11dInfoReset;     //to indicate whether the 11d info in CFG is reset to default
     tSirScanType curScanType;
     tCsrChannel baseChannels;   //This are all the supported channels AND(&) to the current eBand
@@ -702,12 +705,12 @@
     tANI_U8 bgScanChannelList[WNI_CFG_BG_SCAN_CHANNEL_LIST_LEN];
     //the ChannelInfo member is not used in this structure.
     //numBGScanChannel and bgScanChannelList are used for the BG scan channel info
-    tCsrBGScanRequest bgScanParams;  
+    tCsrBGScanRequest bgScanParams;
     tANI_BOOLEAN fRestartIdleScan;
     tANI_U32 nIdleScanTimeGap;  //the time since last trying to trigger idle scan
     tCsrOsChannelMask osScanChannelMask;//keep a track of channels to be scnned while in traffic condition
     tANI_U16 nBssLimit; //the maximum number of BSS in scan cache
-    /*channelPowerInfoList24 has been seen corrupted. Set this flag to true trying to 
+    /*channelPowerInfoList24 has been seen corrupted. Set this flag to true trying to
     * detect when it happens. Adding this into code because we can't reproduce it easily.
     * We don't know when it happens. */
     tANI_BOOLEAN fValidateList;
@@ -717,8 +720,8 @@
     * to determine the country code & domain */
     tANI_BOOLEAN fEnableBypass11d;
 
-    /*Customer wants to optimize the scan time. Avoiding scans(passive) on DFS 
-    * channels while swipping through both bands can save some time 
+    /*Customer wants to optimize the scan time. Avoiding scans(passive) on DFS
+    * channels while swipping through both bands can save some time
     * (apprx 1.3 sec) */
     tANI_BOOLEAN fEnableDFSChnlScan;
 
@@ -731,7 +734,7 @@
 
 #ifdef WLAN_AP_STA_CONCURRENCY
     tDblLinkList scanCmdPendingList;
-#endif    
+#endif
     tCsrChannel occupiedChannels;   //This includes all channels on which candidate APs are found
 
     tANI_BOOLEAN fIgnore_chan165;
@@ -768,10 +771,10 @@
     tANI_U32 nAssocRspLength;   //The length, in bytes, of the assoc rsp frame, can be 0
 #ifdef WLAN_FEATURE_VOWIFI_11R
     tANI_U32 nRICRspLength; //Length of the parsed RIC response IEs received in reassoc response
-#endif    
+#endif
 #ifdef FEATURE_WLAN_CCX
     tANI_U32 nTspecIeLength;
-#endif    
+#endif
     tANI_U8 *pbFrames;  //Point to a buffer contain the beacon, assoc req, assoc rsp frame, in that order
                         //user needs to use nBeaconLength, nAssocReqLength, nAssocRspLength to desice where
                         //each frame starts and ends.
@@ -780,7 +783,7 @@
 
 
 typedef struct tagCsrLinkQualityIndInfo
-{   
+{
    csrRoamLinkQualityIndCallback  callback;
    void                          *context;
 }tCsrLinkQualityIndInfo;
@@ -796,7 +799,7 @@
    tANI_U8                staId;
    tANI_U8                numClient;
    tpAniSirGlobal         pMac;
-   /* To remember if the peStats timer is stopped successfully or not */   
+   /* To remember if the peStats timer is stopped successfully or not */
    tANI_BOOLEAN           timerStopFailed;
 
 }tCsrPeStatsReqInfo;
@@ -834,7 +837,7 @@
     eCsrConnectState connectState;
     tCsrRoamConnectedProfile connectedProfile;
     tCsrRoamConnectedInfo connectedInfo;
-    tCsrRoamProfile *pCurRoamProfile;   
+    tCsrRoamProfile *pCurRoamProfile;
     tSirBssDescription *pConnectBssDesc;
     tANI_U16 NumPmkidCache;
     tPmkidCacheInfo PmkidCacheInfo[CSR_MAX_PMKID_ALLOWED];
@@ -850,7 +853,7 @@
     tANI_BOOLEAN fRoaming;  //indicate whether CSR is roaming (either via lostlink or dynamic roaming)
     //to remember some parameters needed for START_BSS.
     //All member must be set every time we try to join or start an IBSS or BT-AMP
-    tCsrRoamStartBssParams bssParams;   
+    tCsrRoamStartBssParams bssParams;
     tANI_U32 nWpaRsnReqIeLength;   //the byte count of pWpaRsnIE;
     tANI_U8 *pWpaRsnReqIE; //this contain the WPA/RSN IE in assoc request or the one sent in beacon (IBSS)
     tANI_U32 nWpaRsnRspIeLength;    //the byte count for pWpaRsnRspIE
@@ -877,12 +880,12 @@
     eCsrRoamResult roamResult;  //the roamResult that is used when the roaming timer fires
     tCsrRoamJoinStatus joinFailStatusCode;    //This is the reason code for join(assoc) failure
     //The status code returned from PE for deauth or disassoc (in case of lostlink), or our own dynamic roaming
-    tANI_U32 roamingStatusCode;     
+    tANI_U32 roamingStatusCode;
     tANI_U16 NumPmkidCandidate;
     tPmkidCandidateInfo PmkidCandidateInfo[CSR_MAX_PMKID_ALLOWED];
  #ifdef FEATURE_WLAN_WAPI
     tANI_U16 NumBkidCandidate;
-    tBkidCandidateInfo BkidCandidateInfo[CSR_MAX_BKID_ALLOWED]; 
+    tBkidCandidateInfo BkidCandidateInfo[CSR_MAX_BKID_ALLOWED];
 #endif
     tANI_BOOLEAN fWMMConnection;
 #ifdef FEATURE_WLAN_BTAMP_UT_RF
@@ -901,9 +904,9 @@
     tANI_U32 roamTS1;
 #endif
     tANI_U8 bRefAssocStartCnt;   //Tracking assoc start indication
-   /* to force the AP initiate fresh 802.1x authentication after re-association need to clear 
+   /* to force the AP initiate fresh 802.1x authentication after re-association need to clear
     * the PMKID cache. To clear the cache in this particular case this is added
-    * it is needed by the HS 2.0 passpoint certification 5.2.a and b testcases */ 
+    * it is needed by the HS 2.0 passpoint certification 5.2.a and b testcases */
     tANI_BOOLEAN fIgnorePMKIDCache;
 } tCsrRoamSession;
 
@@ -915,15 +918,15 @@
     tDblLinkList channelList24;
     tCsrConfig configParam;
     tANI_U32 numChannelsEeprom; //total channels of eeprom
-    tCsrChannel base20MHzChannels;   //The channel base to work on              
-    tCsrChannel base40MHzChannels;   //center channels for 40MHz channels      
-    eCsrRoamState curState[CSR_ROAM_SESSION_MAX];  
+    tCsrChannel base20MHzChannels;   //The channel base to work on
+    tCsrChannel base40MHzChannels;   //center channels for 40MHz channels
+    eCsrRoamState curState[CSR_ROAM_SESSION_MAX];
     eCsrRoamSubState curSubState[CSR_ROAM_SESSION_MAX];
     //This may or may not have the up-to-date valid channel list
     //It is used to get WNI_CFG_VALID_CHANNEL_LIST and not allocate memory all the time
     tSirMacChanNum validChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN];
     tANI_U32 numValidChannels; //total number of channels in CFG
-    
+
     tANI_S32 sPendingCommands;
     tPalTimerHandle hTimerWaitForKey;  //To support timeout for WaitForKey state
     tCsrSummaryStatsInfo       summaryStatsInfo;
@@ -945,8 +948,8 @@
     /* TODO : Upto here */
     tCsrTimerInfo WaitForKeyTimerInfo;
     tCsrRoamSession   *roamSession;
-    tANI_U32 transactionId;        // Current transaction ID for internal use. 
-#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING    
+    tANI_U32 transactionId;        // Current transaction ID for internal use.
+#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
     tCsrNeighborRoamControlInfo neighborRoamInfo;
 #endif
 #ifdef FEATURE_WLAN_LFR
@@ -964,43 +967,43 @@
 #define GET_NEXT_ROAM_ID(pRoamStruct)  (((pRoamStruct)->nextRoamId + 1 == 0) ? 1 : (pRoamStruct)->nextRoamId)
 #define CSR_IS_ROAM_STATE(pMac, state, sessionId)  ( (state) == (pMac)->roam.curState[sessionId] )
 
-#define CSR_IS_ROAM_STOP(pMac, sessionId) CSR_IS_ROAM_STATE( (pMac), eCSR_ROAMING_STATE_STOP, sessionId ) 
-#define CSR_IS_ROAM_INIT(pMac, sessionId)  CSR_IS_ROAM_STATE( (pMac), eCSR_ROAMING_STATE_INIT, sessionId ) 
+#define CSR_IS_ROAM_STOP(pMac, sessionId) CSR_IS_ROAM_STATE( (pMac), eCSR_ROAMING_STATE_STOP, sessionId )
+#define CSR_IS_ROAM_INIT(pMac, sessionId)  CSR_IS_ROAM_STATE( (pMac), eCSR_ROAMING_STATE_INIT, sessionId )
 #define CSR_IS_ROAM_SCANNING(pMac, sessionId)  CSR_IS_ROAM_STATE( pMac, eCSR_ROAMING_STATE_SCANNING, sessionId )
 #define CSR_IS_ROAM_JOINING(pMac, sessionId)   CSR_IS_ROAM_STATE( pMac, eCSR_ROAMING_STATE_JOINING, sessionId )
-#define CSR_IS_ROAM_IDLE(pMac, sessionId) CSR_IS_ROAM_STATE( pMac, eCSR_ROAMING_STATE_IDLE, sessionId ) 
+#define CSR_IS_ROAM_IDLE(pMac, sessionId) CSR_IS_ROAM_STATE( pMac, eCSR_ROAMING_STATE_IDLE, sessionId )
 #define CSR_IS_ROAM_JOINED(pMac, sessionId)    CSR_IS_ROAM_STATE( pMac, eCSR_ROAMING_STATE_JOINED, sessionId )
 
 #define CSR_IS_ROAM_SUBSTATE(pMac, subState, sessionId)   ((subState) == (pMac)->roam.curSubState[sessionId])
-#define CSR_IS_ROAM_SUBSTATE_JOIN_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_AUTH_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_AUTH_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_REASSOC_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_DISASSOC_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_DISASSOC_NO_JOIN(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_REASSOC_FAIL(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_DISASSOC_FORCED(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_FORCED, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DEAUTH_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_START_BSS_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_START_BSS_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_STOP_BSS_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_STOP_BSS_REQ, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_DISCONNECT_CONTINUE(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, sessionId) 
+#define CSR_IS_ROAM_SUBSTATE_JOIN_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_AUTH_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_AUTH_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_REASSOC_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_DISASSOC_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_DISASSOC_NO_JOIN(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_REASSOC_FAIL(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_DISASSOC_FORCED(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_FORCED, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_DEAUTH_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DEAUTH_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_START_BSS_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_START_BSS_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_STOP_BSS_REQ(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_STOP_BSS_REQ, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_DISCONNECT_CONTINUE(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING, sessionId)
 #define CSR_IS_ROAM_SUBSTATE_CONFIG(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_CONFIG, sessionId)
 #define CSR_IS_ROAM_SUBSTATE_WAITFORKEY(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_WAIT_FOR_KEY, sessionId)
-#define CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_HO_NT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_NO_TRAFFIC, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_HO_NRT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_NON_REALTIME_TRAFFIC, sessionId) 
-#define CSR_IS_ROAM_SUBSTATE_HO_RT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_REALTIME_TRAFFIC, sessionId) 
+#define CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_HO_NT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_NO_TRAFFIC, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_HO_NRT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_NON_REALTIME_TRAFFIC, sessionId)
+#define CSR_IS_ROAM_SUBSTATE_HO_RT(pMac, sessionId)    CSR_IS_ROAM_SUBSTATE((pMac), eCSR_ROAM_SUBSTATE_JOINED_REALTIME_TRAFFIC, sessionId)
 
 #define CSR_IS_PHY_MODE_B_ONLY(pMac) \
         ((eCSR_DOT11_MODE_11b == (pMac)->roam.configParam.phyMode) ||\
         (eCSR_DOT11_MODE_11b_ONLY == (pMac)->roam.configParam.phyMode))
-        
+
 #define CSR_IS_PHY_MODE_G_ONLY(pMac) \
-        (eCSR_DOT11_MODE_11g == (pMac)->roam.configParam.phyMode || eCSR_DOT11_MODE_11g_ONLY == (pMac)->roam.configParam.phyMode)        
-        
+        (eCSR_DOT11_MODE_11g == (pMac)->roam.configParam.phyMode || eCSR_DOT11_MODE_11g_ONLY == (pMac)->roam.configParam.phyMode)
+
 #define CSR_IS_PHY_MODE_A_ONLY(pMac) \
         ((eCSR_DOT11_MODE_11a == (pMac)->roam.configParam.phyMode) ||\
         (eCSR_DOT11_MODE_11a_ONLY == (pMac)->roam.configParam.phyMode))
-        
+
 #ifdef WLAN_FEATURE_11AC
 #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \
         ((eCSR_DOT11_MODE_abg & (phyMode)) || (eCSR_DOT11_MODE_11n & (phyMode)) || \
@@ -1056,7 +1059,7 @@
 
 #define CSR_IS_CHANNEL_24GHZ(chnNum) \
         (((chnNum) > 0) && ((chnNum) <= CSR_MAX_24GHz_CHANNEL_NUMBER))
-        
+
 #define CSR_IS_SAME_BAND_CHANNELS(ch1, ch2) (CSR_IS_CHANNEL_5GHZ(ch1) == CSR_IS_CHANNEL_5GHZ(ch2))
 
 
@@ -1065,7 +1068,7 @@
 // DEAUTHIND
 #define CSR_IS_ROAMING(pSession) ((CSR_IS_LOSTLINK_ROAMING((pSession)->roamingReason)) || \
                               (eCsrDynamicRoaming == (pSession)->roamingReason)  || \
-                              (eCsrReassocRoaming == (pSession)->roamingReason))   
+                              (eCsrReassocRoaming == (pSession)->roamingReason))
 
 
 #define CSR_IS_SET_KEY_COMMAND( pCommand )    ( eSmeCommandSetKey == (pCommand)->command )
@@ -1086,14 +1089,14 @@
                                      tCsrRoamModifyProfileFields *pModifyProfileFields);
 /* ---------------------------------------------------------------------------
     \fn csrGetModifyProfileFields
-    \brief HDD or SME - QOS calls this function to get the current values of 
+    \brief HDD or SME - QOS calls this function to get the current values of
     connected profile fields changing which can cause reassoc.
     This function must be called after CFG is downloaded and STA is in connected
     state.
-    \param pModifyProfileFields - pointer to the connected profile fields 
+    \param pModifyProfileFields - pointer to the connected profile fields
     changing which can cause reassoc
 
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetModifyProfileFields(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                      tCsrRoamModifyProfileFields * pModifyProfileFields);
@@ -1132,8 +1135,8 @@
   \fn csrRoamRegisterLinkQualityIndCallback
 
   \brief
-  a CSR function to allow HDD to register a callback handler with CSR for 
-  link quality indications. 
+  a CSR function to allow HDD to register a callback handler with CSR for
+  link quality indications.
 
   Only one callback may be registered at any time.
   In order to deregister the callback, a NULL cback may be provided.
@@ -1142,34 +1145,34 @@
 
   \param callback - Call back being registered
   \param pContext - user data
-  
+
   DEPENDENCIES: After CSR open
 
-  \return eHalStatus  
+  \return eHalStatus
 -----------------------------------------------------------------------------*/
 eHalStatus csrRoamRegisterLinkQualityIndCallback(tpAniSirGlobal pMac,
-                                                 csrRoamLinkQualityIndCallback   callback,  
+                                                 csrRoamLinkQualityIndCallback   callback,
                                                  void                           *pContext);
 /* ---------------------------------------------------------------------------
     \fn csrGetStatistics
-    \brief csr function that client calls to register a callback to get 
-    different PHY level statistics from CSR. 
-    
+    \brief csr function that client calls to register a callback to get
+    different PHY level statistics from CSR.
+
     \param requesterId - different client requesting for statistics, HDD, UMA/GAN etc
     \param statsMask - The different category/categories of stats requester is looking for
     \param callback - SME sends back the requested stats using the callback
-    \param periodicity - If requester needs periodic update, 0 means it's an one 
+    \param periodicity - If requester needs periodic update, 0 means it's an one
                          time request
     \param cache - If requester is happy with cached stats
     \param staId - The station ID for which the stats is requested for
     \param pContext - user context to be passed back along with the callback
 
-    \return eHalStatus     
+    \return eHalStatus
   ---------------------------------------------------------------------------*/
-eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, 
-                            tANI_U32 statsMask, 
-                            tCsrStatsCallback callback, 
-                            tANI_U32 periodicity, tANI_BOOLEAN cache, 
+eHalStatus csrGetStatistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId,
+                            tANI_U32 statsMask,
+                            tCsrStatsCallback callback,
+                            tANI_U32 periodicity, tANI_BOOLEAN cache,
                             tANI_U8 staId, void *pContext);
 
 
@@ -1177,18 +1180,18 @@
 eHalStatus csrRoamRegisterCallback(tpAniSirGlobal pMac, csrRoamCompleteCallback callback, void *pContext);
 /* ---------------------------------------------------------------------------
     \fn csrGetConfigParam
-    \brief HDD calls this function to get the global settings currently maintained by CSR. 
+    \brief HDD calls this function to get the global settings currently maintained by CSR.
     \param pParam - caller allocated memory
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrGetConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam);
 
 /* ---------------------------------------------------------------------------
     \fn csrMsgProcessor
-    \brief HDD calls this function to change some global settings. 
+    \brief HDD calls this function to change some global settings.
     caller must set the all fields or call csrGetConfigParam to prefill the fields.
     \param pParam - caller allocated memory
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam);
 
@@ -1198,38 +1201,38 @@
     \brief HDD calls this function for the messages that are handled by CSR.
     \param pMsgBuf - a pointer to a buffer that maps to various structures base on the message type.
     The beginning of the buffer can always map to tSirSmeRsp.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrMsgProcessor( tpAniSirGlobal pMac,  void *pMsgBuf );
 
 /* ---------------------------------------------------------------------------
     \fn csrOpen
-    \brief This function must be called before any API call to CSR. 
-    \return eHalStatus     
+    \brief This function must be called before any API call to CSR.
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrOpen(tpAniSirGlobal pMac);
 /* ---------------------------------------------------------------------------
     \fn csrClose
     \brief To close down CSR module. There should not be any API call into CSR after calling this function.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrClose(tpAniSirGlobal pMac);
 /* ---------------------------------------------------------------------------
     \fn csrStart
     \brief To start CSR.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrStart(tpAniSirGlobal pMac);
 /* ---------------------------------------------------------------------------
     \fn csrStop
     \brief To stop CSR. CSR still keeps its current setting.
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrStop(tpAniSirGlobal pMac);
 /* ---------------------------------------------------------------------------
     \fn csrReady
     \brief To let CSR is ready to operate
-    \return eHalStatus     
+    \return eHalStatus
   -------------------------------------------------------------------------------*/
 eHalStatus csrReady(tpAniSirGlobal pMac);
 
@@ -1238,7 +1241,7 @@
                                 tBkidCacheInfo *pBkidCache);
 
 
-eHalStatus csrScanGetBKIDCandidateList(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrScanGetBKIDCandidateList(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                        tBkidCandidateInfo *pBkidList, tANI_U32 *pNumItems );
 tANI_U32 csrRoamGetNumBKIDCache(tpAniSirGlobal pMac, tANI_U32 sessionId);
 eHalStatus csrRoamSetBKIDCache( tpAniSirGlobal pMac, tANI_U32 sessionId, tBkidCacheInfo *pBKIDCache,
@@ -1246,7 +1249,7 @@
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetWapiReqIE
     \brief return the WAPI IE CSR passes to PE to JOIN request or START_BSS request
-    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the 
+    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the
     needed or IE length in pBuf.
     \param pBuf - Caller allocated memory that contain the IE field, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
@@ -1256,13 +1259,13 @@
 /* ---------------------------------------------------------------------------
     \fn csrRoamGetWapiRspIE
     \brief return the WAPI IE from the beacon or probe rsp if connected
-    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the 
+    \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the
     needed or IE length in pBuf.
     \param pBuf - Caller allocated memory that contain the IE field, if any, upon return
     \return eHalStatus - when fail, it usually means the buffer allocated is not big enough
   -------------------------------------------------------------------------------*/
 eHalStatus csrRoamGetWapiRspIE(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U32 *pLen, tANI_U8 *pBuf);
-tANI_U8 csrConstructWapiIe( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, 
+tANI_U8 csrConstructWapiIe( tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile,
                             tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe );
 #endif /* FEATURE_WLAN_WAPI */
 
@@ -1275,12 +1278,12 @@
 tANI_U8 csrGetInfraOperationChannel( tpAniSirGlobal pMac, tANI_U8 sessionId);
 tANI_U8 csrGetConcurrentOperationChannel( tpAniSirGlobal pMac );
 
-eHalStatus csrRoamCopyConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, 
+eHalStatus csrRoamCopyConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId,
                                tCsrRoamConnectedProfile *pProfile);
 tANI_BOOLEAN csrIsSetKeyAllowed(tpAniSirGlobal pMac, tANI_U32 sessionId);
 
 void csrSetOppositeBandChannelInfo( tpAniSirGlobal pMac );
-void csrConstructCurrentValidChannelList( tpAniSirGlobal pMac, tDblLinkList *pChannelSetList, 
+void csrConstructCurrentValidChannelList( tpAniSirGlobal pMac, tDblLinkList *pChannelSetList,
                                             tANI_U8 *pChannelList, tANI_U8 bSize, tANI_U8 *pNumChannels );
 
 #endif
@@ -1295,7 +1298,7 @@
 tANI_BOOLEAN csrRoamIsCCXAssoc(tpAniSirGlobal pMac);
 #endif
 
-//Remove this code once SLM_Sessionization is supported 
+//Remove this code once SLM_Sessionization is supported
 //BMPS_WORKAROUND_NOT_NEEDED
 void csrDisconnectAllActiveSessions(tpAniSirGlobal pMac);
 
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index 18d26b9..7d7e77d 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -108,6 +108,7 @@
    pMac->btc.btcReady = VOS_FALSE;
    pMac->btc.btcEventState = 0;
    pMac->btc.btcHBActive = VOS_TRUE;
+   pMac->btc.btcScanCompromise = VOS_FALSE;
 
    vosStatus = vos_timer_init( &pMac->btc.restoreHBTimer,
                       VOS_TIMER_TYPE_SW,
@@ -1911,7 +1912,18 @@
            pMac->btc.btcHBActive = VOS_TRUE;
         }
      }
-
+     else if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_SCAN_COMPROMISED)
+     {
+         pMac->btc.btcScanCompromise = VOS_TRUE;
+         smsLog(pMac, LOGW, "Coex indication in %s(), type - SIR_COEX_IND_TYPE_SCAN_COMPROMISED ",
+             __func__);
+     }
+     else if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_SCAN_NOT_COMPROMISED)
+     {
+         pMac->btc.btcScanCompromise = VOS_FALSE;
+         smsLog(pMac, LOGW, "Coex indication in %s(), type - SIR_COEX_IND_TYPE_SCAN_NOT_COMPROMISED ",
+             __func__);
+     }
      // unknown indication type
      else
      {
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 1820e68..7a72aa1 100755
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -944,6 +944,8 @@
     pMac->roam.configParam.nActiveMinChnTime = CSR_ACTIVE_MIN_CHANNEL_TIME;
     pMac->roam.configParam.nPassiveMaxChnTime = CSR_PASSIVE_MAX_CHANNEL_TIME;
     pMac->roam.configParam.nPassiveMinChnTime = CSR_PASSIVE_MIN_CHANNEL_TIME;
+    pMac->roam.configParam.nActiveMaxChnTimeBtc = CSR_ACTIVE_MAX_CHANNEL_TIME_BTC;
+    pMac->roam.configParam.nActiveMinChnTimeBtc = CSR_ACTIVE_MIN_CHANNEL_TIME_BTC;
 #ifdef WLAN_AP_STA_CONCURRENCY
     pMac->roam.configParam.nActiveMaxChnTimeConc = CSR_ACTIVE_MAX_CHANNEL_TIME_CONC;
     pMac->roam.configParam.nActiveMinChnTimeConc = CSR_ACTIVE_MIN_CHANNEL_TIME_CONC;
@@ -1390,50 +1392,58 @@
         pMac->roam.configParam.bgScanInterval = pParam->bgScanInterval;
         //if HDD passed down non zero values then only update,
         //otherwise keep using the defaults
-        if(pParam->nActiveMaxChnTime)
+        if (pParam->nActiveMaxChnTime)
         {
             pMac->roam.configParam.nActiveMaxChnTime = pParam->nActiveMaxChnTime;
         }
-        if(pParam->nActiveMinChnTime)
+        if (pParam->nActiveMinChnTime)
         {
             pMac->roam.configParam.nActiveMinChnTime = pParam->nActiveMinChnTime;
         }
-        if(pParam->nPassiveMaxChnTime)
+        if (pParam->nPassiveMaxChnTime)
         {
             pMac->roam.configParam.nPassiveMaxChnTime = pParam->nPassiveMaxChnTime;
         }
-        if(pParam->nPassiveMinChnTime)
+        if (pParam->nPassiveMinChnTime)
         {
             pMac->roam.configParam.nPassiveMinChnTime = pParam->nPassiveMinChnTime;
         }
+        if (pParam->nActiveMaxChnTimeBtc)
+        {
+            pMac->roam.configParam.nActiveMaxChnTimeBtc = pParam->nActiveMaxChnTimeBtc;
+        }
+        if (pParam->nActiveMinChnTimeBtc)
+        {
+            pMac->roam.configParam.nActiveMinChnTimeBtc = pParam->nActiveMinChnTimeBtc;
+        }
 #ifdef WLAN_AP_STA_CONCURRENCY
-        if(pParam->nActiveMaxChnTimeConc)
+        if (pParam->nActiveMaxChnTimeConc)
         {
             pMac->roam.configParam.nActiveMaxChnTimeConc = pParam->nActiveMaxChnTimeConc;
         }
-        if(pParam->nActiveMinChnTimeConc)
+        if (pParam->nActiveMinChnTimeConc)
         {
             pMac->roam.configParam.nActiveMinChnTimeConc = pParam->nActiveMinChnTimeConc;
         }
-        if(pParam->nPassiveMaxChnTimeConc)
+        if (pParam->nPassiveMaxChnTimeConc)
         {
             pMac->roam.configParam.nPassiveMaxChnTimeConc = pParam->nPassiveMaxChnTimeConc;
         }
-        if(pParam->nPassiveMinChnTimeConc)
+        if (pParam->nPassiveMinChnTimeConc)
         {
             pMac->roam.configParam.nPassiveMinChnTimeConc = pParam->nPassiveMinChnTimeConc;
         }
-        if(pParam->nRestTimeConc)
+        if (pParam->nRestTimeConc)
         {
             pMac->roam.configParam.nRestTimeConc = pParam->nRestTimeConc;
         }
-        if(pParam->nNumChanCombinedConc)
+        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)
+        if (pParam->impsSleepTime)
         {
             //Change the unit from second to microsecond
             tANI_U32 impsSleepTime = pParam->impsSleepTime * PAL_TIMER_TO_SEC_UNIT;
@@ -1460,7 +1470,7 @@
 #endif
         //if HDD passed down non zero values for age params, then only update,
         //otherwise keep using the defaults
-        if(pParam->nScanResultAgeCount)
+        if (pParam->nScanResultAgeCount)
         {
             pMac->roam.configParam.agingCount = pParam->nScanResultAgeCount;
         }
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 59b6b07..242d98a 100755
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -396,6 +396,8 @@
             pScanRequest->maxChnTime = pMac->roam.configParam.nPassiveMaxChnTimeConc;
             pScanRequest->minChnTime = pMac->roam.configParam.nPassiveMinChnTimeConc;
         }
+	pScanRequest->maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+	pScanRequest->minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
 
         pScanRequest->restTime = pMac->roam.configParam.nRestTimeConc;
         
@@ -417,6 +419,8 @@
         pScanRequest->maxChnTime = pMac->roam.configParam.nPassiveMaxChnTime;
         pScanRequest->minChnTime = pMac->roam.configParam.nPassiveMinChnTime;
     }
+	pScanRequest->maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+	pScanRequest->minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
 
 #ifdef WLAN_AP_STA_CONCURRENCY
     //No rest time if no sessions are connected.
@@ -728,7 +732,7 @@
                 }
 #ifdef WLAN_AP_STA_CONCURRENCY
                 if(pScanRequest->restTime == 0)
-                    {
+                {
                     //Need to set restTime only if at least one session is connected
                     if(csrIsAnySessionConnected(pMac))
                     {
@@ -737,11 +741,11 @@
                 }
 #endif
                  /*For Standalone wlan : channel time will remain the same.
-                                  For BTC with A2DP up: Channel time = Channel time * 2 , if station is not already associated.
-                                  This has been done to provide a larger scan window for faster connection during btc.Else Scan is seen
-                                  to take a long time.
-                                  For BTC with A2DP up: Channel time will not be doubled, if station is already associated.
-                               */
+                   For BTC with A2DP up: Channel time = Channel time * 2 , if station is not already associated.
+                   This has been done to provide a larger scan window for faster connection during btc.Else Scan is seen
+                   to take a long time.
+                   For BTC with A2DP up: Channel time will not be doubled, if station is already associated.
+                 */
                 status = csrRoamGetConnectState(pMac,sessionId,&ConnectState);
                 if (HAL_STATUS_SUCCESS(status) &&
                     pMac->btc.fA2DPUp &&
@@ -751,6 +755,9 @@
                     pScanRequest->maxChnTime = pScanRequest->maxChnTime << 1;
                     pScanRequest->minChnTime = pScanRequest->minChnTime << 1;
                 }  
+
+		pScanRequest->maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+		pScanRequest->minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
                 //Need to make the following atomic
                 pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
                 
@@ -762,7 +769,7 @@
                 // If it is the first scan request from HDD, CSR checks if it is for 11d. 
                 // If it is not, CSR will save the scan request in the pending cmd queue 
                 // & issue an 11d scan request to PE.
-                if(((0 == pScanCmd->u.scanCmd.scanID)
+                if (((0 == pScanCmd->u.scanCmd.scanID)
                    && (eCSR_SCAN_REQUEST_11D_SCAN != pScanRequest->requestType))
 #ifdef SOFTAP_CHANNEL_RANGE
                    && (eCSR_SCAN_SOFTAP_CHANNEL_RANGE != pScanRequest->requestType)
@@ -777,19 +784,19 @@
                     palZeroMemory(pMac->hHdd, &scanReq, sizeof(tCsrScanRequest));
 
                     p11dScanCmd = csrGetCommandBuffer(pMac);
-                    if(p11dScanCmd)
+                    if (p11dScanCmd)
                     {
                         tANI_U32 numChn = pMac->scan.baseChannels.numChannels;
 
                         palZeroMemory(pMac->hHdd, &p11dScanCmd->u.scanCmd, sizeof(tScanCmd));
                         status = palAllocateMemory( pMac->hHdd, (void **)&pChnInfo->ChannelList, numChn );
-                        if( !HAL_STATUS_SUCCESS( status ) )
+                        if ( !HAL_STATUS_SUCCESS( status ) )
                         {
                             break;
                         }
                         status = palCopyMemory( pMac->hHdd, pChnInfo->ChannelList, 
                                     pMac->scan.baseChannels.channelList, numChn );
-                        if( !HAL_STATUS_SUCCESS( status ) )
+                        if ( !HAL_STATUS_SUCCESS( status ) )
                         {
                             palFreeMemory( pMac->hHdd, pChnInfo->ChannelList );
                             pChnInfo->ChannelList = NULL;
@@ -817,13 +824,16 @@
                             p11dScanCmd->u.scanCmd.reason = eCsrScanIdleScan;
                             scanReq.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
                             scanReq.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+
+			    scanReq.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+			    scanReq.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
                         }
 
                         status = csrScanCopyRequest(pMac, &p11dScanCmd->u.scanCmd.u.scanRequest, &scanReq);
                         //Free the channel list
                         palFreeMemory( pMac->hHdd, pChnInfo->ChannelList );
 
-                        if(HAL_STATUS_SUCCESS(status))
+                        if (HAL_STATUS_SUCCESS(status))
                         {
                             //Start process the command
 #ifdef WLAN_AP_STA_CONCURRENCY
@@ -949,6 +959,8 @@
     scanReq.requestType = reqType;
     scanReq.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
     scanReq.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+    scanReq.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+    scanReq.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
     //Scan with invalid sessionId. 
     //This results in SME using the first available session to scan.
     status = csrScanRequest(pMac, CSR_SESSION_ID_INVALID, &scanReq, 
@@ -1218,6 +1230,8 @@
         pCommand->u.scanCmd.pContext = NULL;
         pCommand->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
         pCommand->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+        pCommand->u.scanCmd.u.scanRequest.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+        pCommand->u.scanCmd.u.scanRequest.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
         pCommand->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
         if(pSession->connectedProfile.SSID.length)
         {
@@ -1378,6 +1392,8 @@
         pCommand->u.scanCmd.pContext = NULL;
         pCommand->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
         pCommand->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+        pCommand->u.scanCmd.u.scanRequest.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+        pCommand->u.scanCmd.u.scanRequest.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
         pCommand->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
         if(pSession->pCurRoamProfile)
         {
@@ -1482,6 +1498,8 @@
         pCommand->u.scanCmd.pContext = NULL;
         pCommand->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
         pCommand->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+        pCommand->u.scanCmd.u.scanRequest.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+        pCommand->u.scanCmd.u.scanRequest.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
         pCommand->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
         palCopyMemory(pMac->hHdd, &pCommand->u.scanCmd.u.scanRequest.bssid, bAddr, sizeof(tCsrBssid));
         //Put to the head of pending queue
@@ -4983,6 +5001,8 @@
 #else
 #error unknown chipset
 #endif
+            pMsg->minChannelTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
+            pMsg->maxChannelTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
             //hidden SSID option
             pMsg->hiddenSsid = pScanReqParam->hiddenSsid;
             //rest time
@@ -6552,6 +6572,8 @@
                  pScanCmd->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
                  pScanCmd->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
             }
+	    pScanCmd->u.scanCmd.u.scanRequest.maxChnTimeBtc = pMac->roam.configParam.nActiveMaxChnTimeBtc;
+	    pScanCmd->u.scanCmd.u.scanRequest.minChnTimeBtc = pMac->roam.configParam.nActiveMinChnTimeBtc;
             if(pProfile->BSSIDs.numOfBSSIDs == 1)
             {
                 palCopyMemory(pMac->hHdd, pScanCmd->u.scanCmd.u.scanRequest.bssid, pProfile->BSSIDs.bssid, sizeof(tCsrBssid));
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 6ff32e9..288dde7 100755
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -64,6 +64,9 @@
 #define CSR_ACTIVE_MAX_CHANNEL_TIME    40
 #define CSR_ACTIVE_MIN_CHANNEL_TIME    20
 
+#define CSR_ACTIVE_MAX_CHANNEL_TIME_BTC    120
+#define CSR_ACTIVE_MIN_CHANNEL_TIME_BTC    60
+
 #ifdef WLAN_AP_STA_CONCURRENCY
 #define CSR_PASSIVE_MAX_CHANNEL_TIME_CONC   110
 #define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC   60