qcacld-3.0: Cleanup unused scan params and ini

Cleanup unused scan params and ini as they are moved to scan
component.

Change-Id: I67a589133e58fd7740d7edc93d32a2d9fcd14c5a
CRs-Fixed: 2369068

core/hdd/inc/wlan_hdd_cfg.h

@@ -185,29 +185,6 @@ enum hdd_dot11_mode {
 #define CFG_CHANNEL_BONDING_MODE_MAX           WNI_CFG_CHANNEL_BONDING_MODE_STAMAX
 #define CFG_CHANNEL_BONDING_MODE_DEFAULT       WNI_CFG_CHANNEL_BONDING_MODE_STADEF
 
-/*
- * <ini>
- * gScanResultAgeCount - Set scan result age count
- * @Min: 1
- * @Max: 100
- * @Default: 1
- *
- * This ini parameter is the number of times a scan
- * doesn't find it before it is removed from results.
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_SCAN_RESULT_AGE_COUNT_NAME         "gScanResultAgeCount"
-#define CFG_SCAN_RESULT_AGE_COUNT_MIN          (1)
-#define CFG_SCAN_RESULT_AGE_COUNT_MAX          (100)
-#define CFG_SCAN_RESULT_AGE_COUNT_DEFAULT      (1)
-
 /*
  * <ini>
  * gEnableDFSChnlScan - Enable DFS channel scan
@@ -246,28 +223,6 @@ enum hdd_dot11_mode {
 #define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MAX               (1)
 #define CFG_ENABLE_DFS_PNO_CHNL_SCAN_DEFAULT           (1)
 
-/*
- * <ini>
- * gEnableFirstScan2GOnly - Enable first scan 2G only
- * @Min: 0
- * @Max: 1
- * @Default: 0
- *
- * This ini is used to scan 2G channels only in first scan.
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ENABLE_FIRST_SCAN_2G_ONLY_NAME            "gEnableFirstScan2GOnly"
-#define CFG_ENABLE_FIRST_SCAN_2G_ONLY_MIN        (0)
-#define CFG_ENABLE_FIRST_SCAN_2G_ONLY_MAX        (1)
-#define CFG_ENABLE_FIRST_SCAN_2G_ONLY_DEFAULT    (0)
-
 /*
  * <ini>
  * gScanAgingTime - Set scan aging time
@@ -398,98 +353,6 @@ enum hdd_dot11_mode {
 #define CFG_MAX_SCAN_COUNT_MAX            (8)
 #define CFG_MAX_SCAN_COUNT_DEFAULT        (4)
 
-/*
- * <ini>
- * gPassiveMaxChannelTime - Set max channel time for passive scan
- * @Min: 0
- * @Max: 10000
- * @Default: 110
- *
- * This ini is used to set maximum channel time in secs spent in
- * passive scan
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_NAME      "gPassiveMaxChannelTime"
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_MIN       (0)
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_MAX       (10000)
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_DEFAULT   (110)
-
-/*
- * <ini>
- * gActiveMaxChannelTime - Set max channel time for active scan
- * @Min: 0
- * @Max: 10000
- * @Default: 40
- *
- * This ini is used to set maximum channel time in secs spent in
- * active scan
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_NAME       "gActiveMaxChannelTime"
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_MIN        (0)
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_MAX        (10000)
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_DEFAULT    (40)
-
-/*
- * <ini>
- * gScanNumProbes - Set the number of probes on each channel for active scan
- * @Min: 0
- * @Max: 20
- * @Default: 0
- *
- * This ini is used to set number of probes on each channel for
- * active scan
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_SCAN_NUM_PROBES_NAME       "gScanNumProbes"
-#define CFG_SCAN_NUM_PROBES_MIN        (0)
-#define CFG_SCAN_NUM_PROBES_MAX        (20)
-#define CFG_SCAN_NUM_PROBES_DEFAULT    (0)
-
-/*
- * <ini>
- * gScanProbeRepeatTime - Set the probe repeat time on each channel for active scan
- * @Min: 0
- * @Max: 30
- * @Default: 0
- *
- * This ini is used to set probe repeat time on each channel for
- * active scan
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_SCAN_PROBE_REPEAT_TIME_NAME       "gScanProbeRepeatTime"
-#define CFG_SCAN_PROBE_REPEAT_TIME_MIN        (0)
-#define CFG_SCAN_PROBE_REPEAT_TIME_MAX        (30)
-#define CFG_SCAN_PROBE_REPEAT_TIME_DEFAULT    (0)
-
 /*
  * <ini>
  * gChPredictionFullScanMs - Set periodic timer for channel
@@ -539,68 +402,6 @@ enum hdd_dot11_mode {
 #define CFG_CREATE_BUG_REPORT_FOR_SCAN_ENABLE     (1)
 #define CFG_CREATE_BUG_REPORT_FOR_SCAN_DEFAULT    (0)
 
-/*
- * <ini>
- * hostscan_adaptive_dwell_mode - Enable adaptive dwell mode
- * during host scan with conneciton
- * @Min: 0
- * @Max: 4
- * @Default: 2
- *
- * This ini will set the algo used in dwell time optimization
- * during host scan with connection.
- * See enum scan_dwelltime_adaptive_mode.
- * Acceptable values for this:
- * 0: Default (Use firmware default mode)
- * 1: Conservative optimization
- * 2: Moderate optimization
- * 3: Aggressive optimization
- * 4: Static
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_NAME        "hostscan_adaptive_dwell_mode"
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_MIN         (0)
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_MAX         (4)
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_DEFAULT     (2)
-
-/*
- * <ini>
- * hostscan_adaptive_dwell_mode_no_conn - Enable adaptive dwell mode
- * during host scan without connection
- * @Min: 0
- * @Max: 4
- * @Default: 1
- *
- * This ini will set the algo used in dwell time optimization
- * during host scan without connection.
- * See enum scan_dwelltime_adaptive_mode.
- * Acceptable values for this:
- * 0: Default (Use firmware default mode)
- * 1: Conservative optimization
- * 2: Moderate optimization
- * 3: Aggressive optimization
- * 4: Static
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_NAME    "hostscan_adaptive_dwell_mode_no_conn"
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_MIN     (0)
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_MAX     (4)
-#define CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_DEFAULT (1)
-
 /*
  * <ini>
  * extscan_adaptive_dwell_mode - Enable adaptive dwell mode
@@ -712,29 +513,6 @@ enum hdd_dot11_mode {
 #define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_MAX        (4)
 #define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_DEFAULT    (0)
 
-/*
- * <ini>
- * gRssiCatGap - Set Rssi CatGap
- * @Min: 5
- * @Max: 100
- * @Default: 5
- *
- * This ini is used to set default RssiCatGap
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_RSSI_CATEGORY_GAP_NAME             "gRssiCatGap"
-#define CFG_RSSI_CATEGORY_GAP_MIN              (5)
-#define CFG_RSSI_CATEGORY_GAP_MAX              (100)
-#define CFG_RSSI_CATEGORY_GAP_DEFAULT          (5)
-
 #ifdef FEATURE_LFR_SUBNET_DETECTION
 /*
  * <ini>
@@ -1255,125 +1033,6 @@ enum hdd_dot11_mode {
 #define CFG_DISABLE_PACKET_FILTER_MAX		(1)
 #define CFG_DISABLE_PACKET_FILTER_DEFAULT	(1)
 
-/*
- * <ini>
- * gPassiveMaxChannelTimeConc - Maximum passive scan time in milliseconds.
- * @Min: 0
- * @Max: 10000
- * @Default: 110
- *
- * This ini is used to set maximum passive scan time in STA+SAP concurrent
- * mode.
- *
- * Related: None.
- *
- * Supported Feature: Concurrency
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_NAME      "gPassiveMaxChannelTimeConc"
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MIN       (0)
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MAX       (10000)
-#define CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_DEFAULT   (110)
-
-/*
- * <ini>
- * gActiveMaxChannelTimeConc - Maximum active scan time in milliseconds.
- * @Min: 0
- * @Max: 10000
- * @Default: 40
- *
- * This ini is used to set maximum active scan time in STA+SAP concurrent
- * mode.
- *
- * Related: None.
- *
- * Supported Feature: Concurrency
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_NAME       "gActiveMaxChannelTimeConc"
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MIN        (0)
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MAX        (10000)
-#define CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_DEFAULT    (40)
-
-/*
- * <ini>
- * gRestTimeConc - Rest time before moving to a new channel to scan.
- * @Min: 0
- * @Max: 10000
- * @Default: 100
- *
- * This ini is used to configure rest time.
- *
- * Related: None.
- *
- * Supported Feature: Concurrency
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_REST_TIME_CONC_NAME                     "gRestTimeConc"
-#define CFG_REST_TIME_CONC_MIN                      (0)
-#define CFG_REST_TIME_CONC_MAX                      (10000)
-#define CFG_REST_TIME_CONC_DEFAULT                  (100)
-
-/*
- * <ini>
- * gMinRestTimeConc - Mininum time spent on home channel before moving to a
- * new channel to scan.
- * @Min: 0
- * @Max: 50
- * @Default: 50
- *
- * This ini is used to configure minimum time spent on home channel before
- * moving to a new channel to scan.
- *
- * Related: None.
- *
- * Supported Feature: Concurrency
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_MIN_REST_TIME_NAME                      "gMinRestTimeConc"
-#define CFG_MIN_REST_TIME_MIN                       (0)
-#define CFG_MIN_REST_TIME_MAX                       (50)
-#define CFG_MIN_REST_TIME_DEFAULT                   (50)
-
-/*
- * <ini>
- * gIdleTimeConc - Data inactivity time in msec.
- * @Min: 0
- * @Max: 25
- * @Default: 25
- *
- * This ini is used to configure data inactivity time in msec on bss channel
- * that will be used by scan engine in firmware.
- * For example if this value is 25ms then firmware will check for data
- * inactivity every 25ms till gRestTimeConc is reached.
- * If inactive then scan engine will move from home channel to scan the next
- * frequency.
- *
- * Related: None.
- *
- * Supported Feature: Concurrency
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-#define CFG_IDLE_TIME_NAME                          "gIdleTimeConc"
-#define CFG_IDLE_TIME_MIN                           (0)
-#define CFG_IDLE_TIME_MAX                           (25)
-#define CFG_IDLE_TIME_DEFAULT                       (25)
-
 /*
  * <ini>
  * gTxPowerCap - WLAN max tx power
@@ -1603,52 +1262,6 @@ enum hdd_link_speed_rpt_type {
 #define CFG_RA_RATE_LIMIT_INTERVAL_DEFAULT         (60) /*60 SEC */
 #endif
 
-/*
- * <ini>
- * gInitialDwellTime - Used to set initial dwell time
- * @Min: 0
- * @Max: 0
- * @Default: 100
- *
- * This ini is used to set default initial dwell time
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_INITIAL_DWELL_TIME_NAME            "gInitialDwellTime"
-#define CFG_INITIAL_DWELL_TIME_DEFAULT         (0)
-#define CFG_INITIAL_DWELL_TIME_MIN             (0)
-#define CFG_INITIAL_DWELL_TIME_MAX             (100)
-
-/*
- * <ini>
- * gInitialScanNoDFSChnl - WLAN skips scanning the DFS channels
- * @Min: 0
- * @Max: 0
- * @Default: 1
- *
- * This ini is used to set for the first scan after driver
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: Internal/External
- *
- * </ini>
- */
-
-#define CFG_INITIAL_SCAN_NO_DFS_CHNL_NAME         "gInitialScanNoDFSChnl"
-#define CFG_INITIAL_SCAN_NO_DFS_CHNL_DEFAULT      (0)
-#define CFG_INITIAL_SCAN_NO_DFS_CHNL_MIN          (0)
-#define CFG_INITIAL_SCAN_NO_DFS_CHNL_MAX          (1)
-
 #ifdef MSM_PLATFORM
 /*
  * <ini>
@@ -2188,31 +1801,6 @@ enum hdd_link_speed_rpt_type {
 #define CFG_LPRx_MAX         (1)
 #define CFG_LPRx_DEFAULT     (1)
 
-/*
- * <ini>
- * is_bssid_hint_priority - Set priority for connection with bssid_hint
- * BSSID.
- * @Min: 0
- * @Max: 1
- * @Default: 1
- *
- * This ini is used to give priority to BSS for connection which comes
- * as part of bssid_hint
- *
- * Related: None
- *
- * Supported Feature: STA
- *
- * Usage: External
- *
- * </ini>
- */
-
-#define CFG_IS_BSSID_HINT_PRIORITY_NAME    "is_bssid_hint_priority"
-#define CFG_IS_BSSID_HINT_PRIORITY_DEFAULT (0)
-#define CFG_IS_BSSID_HINT_PRIORITY_MIN     (0)
-#define CFG_IS_BSSID_HINT_PRIORITY_MAX     (1)
-
 /*
  * <ini>
  * sae_enabled - Enable/Disable SAE support in driver
@@ -2556,8 +2144,6 @@ struct hdd_config {
 	enum hdd_dot11_mode dot11Mode;
 	uint32_t nChannelBondingMode24GHz;
 	uint32_t nChannelBondingMode5GHz;
-	uint32_t ScanResultAgeCount;
-	uint8_t nRssiCatGap;
 	struct qdf_mac_addr IbssBssid;
 	uint32_t AdHocChannel5G;
 	uint32_t AdHocChannel24G;
@@ -2570,16 +2156,6 @@ struct hdd_config {
 	/* Bitmap for operating voltage corner mode */
 	uint32_t vc_mode_cfg_bitmap;
 #endif
-
-	/* Additional Handoff params */
-	uint32_t nPassiveMaxChnTime;    /* in units of milliseconds */
-	uint32_t nActiveMaxChnTime;     /* in units of milliseconds */
-	uint32_t scan_probe_repeat_time;
-	uint32_t scan_num_probes;
-
-	uint32_t nInitialDwellTime;     /* in units of milliseconds */
-	bool initial_scan_no_dfs_chnl;
-
 	uint8_t wow_data_inactivity_timeout;
 
 	uint32_t DelayedTriggerFrmInt;
@@ -2599,7 +2175,6 @@ struct hdd_config {
 	int32_t linkSpeedRssiHigh;
 	int32_t linkSpeedRssiMid;
 	int32_t linkSpeedRssiLow;
-	bool enableFirstScan2GOnly;
 	bool prevent_link_down;
 	uint8_t scanAgingTimeout;
 	bool fEnableSNRMonitoring;
@@ -2653,8 +2228,6 @@ struct hdd_config {
 
 	bool apf_enabled;
 	bool adaptive_dwell_mode_enabled;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc;
 	enum scan_dwelltime_adaptive_mode extscan_adaptive_dwell_mode;
 	enum scan_dwelltime_adaptive_mode pnoscan_adaptive_dwell_mode;
 	enum scan_dwelltime_adaptive_mode global_adapt_dwelltime_mode;
@@ -2685,7 +2258,6 @@ struct hdd_config {
 	uint32_t mawc_nlo_max_scan_interval;
 	bool enable_11d_in_world_mode;
 	bool enable_lprx;
-	bool is_bssid_hint_priority;
 #ifdef WLAN_FEATURE_SAE
 	bool is_sae_enabled;
 #endif

core/hdd/src/wlan_hdd_cfg.c

@@ -77,20 +77,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_CHANNEL_BONDING_MODE_MIN,
 		     CFG_CHANNEL_BONDING_MODE_MAX),
 
-	REG_VARIABLE(CFG_SCAN_RESULT_AGE_COUNT_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, 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_RSSI_CATEGORY_GAP_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, 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_STRING(CFG_IBSS_BSSID_NAME, WLAN_PARAM_MacAddr,
 			    struct hdd_config, IbssBssid,
 			    VAR_FLAGS_OPTIONAL,
@@ -110,34 +96,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_DISABLE_PACKET_FILTER_MIN,
 		     CFG_DISABLE_PACKET_FILTER_MAX),
 
-	REG_VARIABLE(CFG_PASSIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, 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_ACTIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, 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_SCAN_NUM_PROBES_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, scan_num_probes,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_SCAN_NUM_PROBES_DEFAULT,
-		     CFG_SCAN_NUM_PROBES_MIN,
-		     CFG_SCAN_NUM_PROBES_MAX),
-
-	REG_VARIABLE(CFG_SCAN_PROBE_REPEAT_TIME_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, scan_probe_repeat_time,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_SCAN_PROBE_REPEAT_TIME_DEFAULT,
-		     CFG_SCAN_PROBE_REPEAT_TIME_MIN,
-		     CFG_SCAN_PROBE_REPEAT_TIME_MAX),
-
 	REG_VARIABLE(CFG_MAX_TX_POWER_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, nTxPowerCap,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -231,13 +189,6 @@ struct reg_table_entry g_registry_table[] = {
 			     CFG_LINK_SPEED_RSSI_LOW_MAX,
 			     NULL, 0),
 
-	REG_VARIABLE(CFG_ENABLE_FIRST_SCAN_2G_ONLY_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, 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_SCAN_AGING_PARAM_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, scanAgingTimeout,
 		     VAR_FLAGS_OPTIONAL,
@@ -353,20 +304,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_MIN,
 		     CFG_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_MAX),
 
-	REG_VARIABLE(CFG_INITIAL_DWELL_TIME_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, nInitialDwellTime,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_INITIAL_DWELL_TIME_DEFAULT,
-		     CFG_INITIAL_DWELL_TIME_MIN,
-		     CFG_INITIAL_DWELL_TIME_MAX),
-
-	REG_VARIABLE(CFG_INITIAL_SCAN_NO_DFS_CHNL_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, initial_scan_no_dfs_chnl,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_INITIAL_SCAN_NO_DFS_CHNL_DEFAULT,
-		     CFG_INITIAL_SCAN_NO_DFS_CHNL_MIN,
-		     CFG_INITIAL_SCAN_NO_DFS_CHNL_MAX),
-
 	REG_VARIABLE(CFG_ADVERTISE_CONCURRENT_OPERATION_NAME,
 		     WLAN_PARAM_Integer,
 		     struct hdd_config, advertiseConcurrentOperation,
@@ -511,20 +448,6 @@ struct reg_table_entry g_registry_table[] = {
 		CFG_CREATE_BUG_REPORT_FOR_SCAN_DISABLE,
 		CFG_CREATE_BUG_REPORT_FOR_SCAN_ENABLE),
 
-	REG_VARIABLE(CFG_ADAPTIVE_SCAN_DWELL_MODE_NAME, WLAN_PARAM_Integer,
-		struct hdd_config, scan_adaptive_dwell_mode,
-		VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		CFG_ADAPTIVE_SCAN_DWELL_MODE_DEFAULT,
-		CFG_ADAPTIVE_SCAN_DWELL_MODE_MIN,
-		CFG_ADAPTIVE_SCAN_DWELL_MODE_MAX),
-
-	REG_VARIABLE(CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, scan_adaptive_dwell_mode_nc,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_DEFAULT,
-		     CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_MIN,
-		     CFG_ADAPTIVE_SCAN_DWELL_MODE_NC_MAX),
-
 	REG_VARIABLE(CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_NAME, WLAN_PARAM_Integer,
 		struct hdd_config, extscan_adaptive_dwell_mode,
 		VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -675,13 +598,6 @@ struct reg_table_entry g_registry_table[] = {
 		CFG_LPRx_MIN,
 		CFG_LPRx_MAX),
 
-	REG_VARIABLE(CFG_IS_BSSID_HINT_PRIORITY_NAME, WLAN_PARAM_Integer,
-		struct hdd_config, is_bssid_hint_priority,
-		VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		CFG_IS_BSSID_HINT_PRIORITY_DEFAULT,
-		CFG_IS_BSSID_HINT_PRIORITY_MIN,
-		CFG_IS_BSSID_HINT_PRIORITY_MAX),
-
 #ifdef WLAN_FEATURE_SAE
 	REG_VARIABLE(CFG_IS_SAE_ENABLED_NAME, WLAN_PARAM_Integer,
 		struct hdd_config, is_sae_enabled,
@@ -2076,14 +1992,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
 
 	mac_handle = hdd_ctx->mac_handle;
 
-	if (sme_cfg_set_int(mac_handle,
-				WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
-				config->nPassiveMaxChnTime)
-				== QDF_STATUS_E_FAILURE) {
-		status = false;
-		hdd_err("Couldn't pass on WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME to CFG");
-	}
-
 	if (sme_cfg_set_int(mac_handle,
 		WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
 		config->wow_data_inactivity_timeout) == QDF_STATUS_E_FAILURE) {
@@ -2376,13 +2284,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 		smeConfig->csrConfig.channelBondingMode5GHz =
 			pConfig->nChannelBondingMode5GHz;
 	}
-	smeConfig->csrConfig.nScanResultAgeCount = pConfig->ScanResultAgeCount;
-	smeConfig->csrConfig.bCatRssiOffset = pConfig->nRssiCatGap;
-	smeConfig->csrConfig.nInitialDwellTime = pConfig->nInitialDwellTime;
-	smeConfig->csrConfig.initial_scan_no_dfs_chnl =
-					pConfig->initial_scan_no_dfs_chnl;
-	smeConfig->csrConfig.nActiveMaxChnTime = pConfig->nActiveMaxChnTime;
-	smeConfig->csrConfig.nPassiveMaxChnTime = pConfig->nPassiveMaxChnTime;
 	/* Remaining config params not obtained from registry
 	 * On RF EVB beacon using channel 1.
 	 */
@@ -2395,9 +2296,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 	smeConfig->csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
 	smeConfig->csrConfig.fEnableDFSChnlScan = pConfig->enableDFSChnlScan;
 
-	smeConfig->csrConfig.fFirstScanOnly2GChnl =
-		pConfig->enableFirstScan2GOnly;
-
 	smeConfig->csrConfig.Csr11dinfo.Channels.numChannels = 0;
 
 	hdd_set_power_save_offload_config(hdd_ctx);
@@ -2419,9 +2317,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 					hdd_ctx->psoc, false);
 	}
 
-	/* Scan Results Aging Time out value */
-	smeConfig->csrConfig.scanCfgAgingTime = pConfig->scanAgingTimeout;
-
 	smeConfig->csrConfig.isCoalesingInIBSSAllowed =
 		hdd_ctx->config->isCoalesingInIBSSAllowed;
 
@@ -2432,19 +2327,12 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 
 	cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs);
 
-	smeConfig->csrConfig.max_scan_count =
-			hdd_ctx->config->max_scan_count;
-
 	smeConfig->csrConfig.ho_delay_for_rx =
 		hdd_ctx->config->ho_delay_for_rx;
 	smeConfig->csrConfig.min_delay_btw_roam_scans =
 		hdd_ctx->config->min_delay_btw_roam_scans;
 	smeConfig->csrConfig.roam_trigger_reason_bitmask =
 		hdd_ctx->config->roam_trigger_reason_bitmask;
-	smeConfig->csrConfig.scan_adaptive_dwell_mode =
-			hdd_ctx->config->scan_adaptive_dwell_mode;
-	smeConfig->csrConfig.scan_adaptive_dwell_mode_nc =
-			hdd_ctx->config->scan_adaptive_dwell_mode_nc;
 	smeConfig->csrConfig.enable_ftopen =
 			hdd_ctx->config->enable_ftopen;
 	smeConfig->csrConfig.roam_force_rssi_trigger =

core/hdd/src/wlan_hdd_ioctl.c

@@ -43,7 +43,6 @@
 #endif
 #include "hif.h"
 #include "wlan_scan_ucfg_api.h"
-#include "cfg_ucfg_api.h"
 
 #if defined(LINUX_QCMBR)
 #define SIOCIOCTLTX99 (SIOCDEVPRIVATE+13)
@@ -2127,108 +2126,84 @@ static int hdd_parse_setmaxtxpower_command(uint8_t *pValue, int *pTxPower)
 	return 0;
 } /* End of hdd_parse_setmaxtxpower_command */
 
-static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command,
+static int hdd_get_dwell_time(struct wlan_objmgr_psoc *psoc, uint8_t *command,
 			      char *extra, uint8_t n, uint8_t *len)
 {
-	if (!pCfg || !command || !extra || !len) {
+	uint32_t val = 0;
+
+	if (!psoc || !command || !extra || !len) {
 		hdd_err("argument passed for GETDWELLTIME is incorrect");
 		return -EINVAL;
 	}
 
 	if (strncmp(command, "GETDWELLTIME ACTIVE MAX", 23) == 0) {
-		*len = scnprintf(extra, n, "GETDWELLTIME ACTIVE MAX %u\n",
-				 (int)pCfg->nActiveMaxChnTime);
+		ucfg_scan_cfg_get_active_dwelltime(psoc, &val);
+		*len = scnprintf(extra, n, "GETDWELLTIME ACTIVE MAX %u\n", val);
 		return 0;
 	}
 	if (strncmp(command, "GETDWELLTIME PASSIVE MAX", 24) == 0) {
+		ucfg_scan_cfg_get_passive_dwelltime(psoc, &val);
 		*len = scnprintf(extra, n, "GETDWELLTIME PASSIVE MAX %u\n",
-				 (int)pCfg->nPassiveMaxChnTime);
+				 val);
 		return 0;
 	}
 	if (strncmp(command, "GETDWELLTIME", 12) == 0) {
-		*len = scnprintf(extra, n, "GETDWELLTIME %u\n",
-				 (int)pCfg->nActiveMaxChnTime);
+		ucfg_scan_cfg_get_active_dwelltime(psoc, &val);
+		*len = scnprintf(extra, n, "GETDWELLTIME %u\n", val);
 		return 0;
 	}
 
 	return -EINVAL;
 }
 
-static int hdd_set_dwell_time(struct hdd_adapter *adapter, uint8_t *command)
+static int hdd_set_dwell_time(struct wlan_objmgr_psoc *psoc, uint8_t *command)
 {
-	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
-	struct hdd_config *pCfg;
 	uint8_t *value = command;
-	tSmeConfigParams *sme_config;
 	int val = 0, temp = 0;
 	int retval = 0;
 
-	pCfg = (WLAN_HDD_GET_CTX(adapter))->config;
-	if (!pCfg || !mac_handle) {
-		hdd_err("argument passed for SETDWELLTIME is incorrect");
+	if (!psoc) {
+		hdd_err("psoc is null");
 		return -EINVAL;
 	}
 
-	sme_config = qdf_mem_malloc(sizeof(*sme_config));
-	if (!sme_config) {
-		hdd_err("failed to allocate memory for sme_config");
-		return -ENOMEM;
-	}
-	qdf_mem_zero(sme_config, sizeof(*sme_config));
-	sme_get_config_param(mac_handle, sme_config);
-
 	if (strncmp(command, "SETDWELLTIME ACTIVE MAX", 23) == 0) {
 		if (drv_cmd_validate(command, 23))
 			return -EINVAL;
 
 		value = value + 24;
 		temp = kstrtou32(value, 10, &val);
-		if (temp != 0 || val < CFG_ACTIVE_MAX_CHANNEL_TIME_MIN ||
-		    val > CFG_ACTIVE_MAX_CHANNEL_TIME_MAX) {
+		if (temp || !cfg_in_range(CFG_ACTIVE_MAX_CHANNEL_TIME, val)) {
 			hdd_err("argument passed for SETDWELLTIME ACTIVE MAX is incorrect");
-			retval = -EFAULT;
-			goto free;
+			return -EFAULT;
 		}
-		pCfg->nActiveMaxChnTime = val;
-		sme_config->csrConfig.nActiveMaxChnTime = val;
-		sme_update_config(mac_handle, sme_config);
+		ucfg_scan_cfg_set_active_dwelltime(psoc, val);
 	} else if (strncmp(command, "SETDWELLTIME PASSIVE MAX", 24) == 0) {
 		if (drv_cmd_validate(command, 24))
 			return -EINVAL;
 
 		value = value + 25;
 		temp = kstrtou32(value, 10, &val);
-		if (temp != 0 || val < CFG_PASSIVE_MAX_CHANNEL_TIME_MIN ||
-		    val > CFG_PASSIVE_MAX_CHANNEL_TIME_MAX) {
+		if (temp || !cfg_in_range(CFG_PASSIVE_MAX_CHANNEL_TIME, val)) {
 			hdd_err("argument passed for SETDWELLTIME PASSIVE MAX is incorrect");
-			retval = -EFAULT;
-			goto free;
+			return -EFAULT;
 		}
-		pCfg->nPassiveMaxChnTime = val;
-		sme_config->csrConfig.nPassiveMaxChnTime = val;
-		sme_update_config(mac_handle, sme_config);
+		ucfg_scan_cfg_set_passive_dwelltime(psoc, val);
 	} else if (strncmp(command, "SETDWELLTIME", 12) == 0) {
 		if (drv_cmd_validate(command, 12))
 			return -EINVAL;
 
 		value = value + 13;
 		temp = kstrtou32(value, 10, &val);
-		if (temp != 0 || val < CFG_ACTIVE_MAX_CHANNEL_TIME_MIN ||
-		    val > CFG_ACTIVE_MAX_CHANNEL_TIME_MAX) {
+		if (temp || !cfg_in_range(CFG_ACTIVE_MAX_CHANNEL_TIME, val)) {
 			hdd_err("argument passed for SETDWELLTIME is incorrect");
-			retval = -EFAULT;
-			goto free;
+			return -EFAULT;
 		}
-		pCfg->nActiveMaxChnTime = val;
-		sme_config->csrConfig.nActiveMaxChnTime = val;
-		sme_update_config(mac_handle, sme_config);
+		ucfg_scan_cfg_set_active_dwelltime(psoc, val);
 	} else {
 		retval = -EINVAL;
-		goto free;
 	}
 
-free:
-	qdf_mem_free(sme_config);
 	return retval;
 }
 
@@ -2252,59 +2227,37 @@ struct link_status_priv {
 static int hdd_conc_set_dwell_time(struct hdd_adapter *adapter,
 				   uint8_t *command)
 {
-	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
-	struct hdd_config *p_cfg;
 	u8 *value = command;
-	tSmeConfigParams *sme_config;
 	int val = 0, temp = 0;
 	int retval = 0;
 
-	p_cfg = (WLAN_HDD_GET_CTX(adapter))->config;
-	if (!p_cfg || !mac_handle) {
-		hdd_err("Argument passed for CONCSETDWELLTIME is incorrect");
-		return -EINVAL;
-	}
-
-	sme_config = qdf_mem_malloc(sizeof(*sme_config));
-	if (!sme_config) {
-		hdd_err("Failed to allocate memory for sme_config");
-		return -ENOMEM;
-	}
-
-	qdf_mem_zero(sme_config, sizeof(*sme_config));
-	sme_get_config_param(mac_handle, sme_config);
-
 	if (strncmp(command, "CONCSETDWELLTIME ACTIVE MAX", 27) == 0) {
 		if (drv_cmd_validate(command, 27)) {
 			hdd_err("Invalid driver command");
-			retval = -EINVAL;
-			goto sme_config_free;
+			return -EINVAL;
 		}
 
 		value = value + 28;
 		temp = kstrtou32(value, 10, &val);
-		if (temp != 0 ||
-		    cfg_in_range(CFG_ACTIVE_MAX_CHANNEL_TIME_CONC, val)) {
+		if (temp ||
+		    !cfg_in_range(CFG_ACTIVE_MAX_CHANNEL_TIME_CONC, val)) {
 			hdd_err("CONC ACTIVE MAX value %d incorrect", val);
-			retval = -EFAULT;
-			goto sme_config_free;
+			return -EFAULT;
 		}
 		ucfg_scan_cfg_set_conc_active_dwelltime(
 				(WLAN_HDD_GET_CTX(adapter))->psoc, val);
 	} else if (strncmp(command, "CONCSETDWELLTIME PASSIVE MAX", 28) == 0) {
 		if (drv_cmd_validate(command, 28)) {
 			hdd_err("Invalid driver command");
-			retval = -EINVAL;
-			goto sme_config_free;
+			return -EINVAL;
 		}
 
 		value = value + 29;
 		temp = kstrtou32(value, 10, &val);
-		if (temp != 0 ||
-		    cfg_in_range(CFG_PASSIVE_MAX_CHANNEL_TIME_CONC, val)) {
+		if (temp ||
+		    !cfg_in_range(CFG_PASSIVE_MAX_CHANNEL_TIME_CONC, val)) {
 			hdd_err("CONC PASSIVE MAX val %d incorrect", val);
-			retval = -EFAULT;
-			goto sme_config_free;
+			return -EFAULT;
 		}
 		ucfg_scan_cfg_set_conc_passive_dwelltime(
 				(WLAN_HDD_GET_CTX(adapter))->psoc, val);
@@ -2312,8 +2265,6 @@ static int hdd_conc_set_dwell_time(struct hdd_adapter *adapter,
 		retval = -EINVAL;
 	}
 
-sme_config_free:
-	qdf_mem_free(sme_config);
 	return retval;
 }
 
@@ -4586,13 +4537,12 @@ static int drv_cmd_get_dwell_time(struct hdd_adapter *adapter,
 				  struct hdd_priv_data *priv_data)
 {
 	int ret = 0;
-	struct hdd_config *pCfg =
-		(WLAN_HDD_GET_CTX(adapter))->config;
 	char extra[32];
 	uint8_t len = 0;
 
 	memset(extra, 0, sizeof(extra));
-	ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len);
+	ret = hdd_get_dwell_time(hdd_ctx->psoc, command, extra,
+				 sizeof(extra), &len);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) {
 		hdd_err("failed to copy data to user buffer");
@@ -4610,7 +4560,7 @@ static int drv_cmd_set_dwell_time(struct hdd_adapter *adapter,
 				  uint8_t command_len,
 				  struct hdd_priv_data *priv_data)
 {
-	return hdd_set_dwell_time(adapter, command);
+	return hdd_set_dwell_time(hdd_ctx->psoc, command);
 }
 
 static int drv_cmd_conc_set_dwell_time(struct hdd_adapter *adapter,

core/hdd/src/wlan_hdd_main.c

@@ -14556,35 +14556,12 @@ static int hdd_update_scan_config(struct hdd_context *hdd_ctx)
 	struct scan_user_cfg scan_cfg;
 	struct hdd_config *cfg = hdd_ctx->config;
 	QDF_STATUS status;
-	uint8_t scan_bucket_thre;
-	uint8_t select_5ghz_margin;
-	bool roam_prefer_5ghz;
 	uint32_t mcast_mcc_rest_time = 0;
 
-	status = ucfg_mlme_get_select_5ghz_margin(hdd_ctx->psoc,
-						  &select_5ghz_margin);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		hdd_err("Failed to get select_5ghz_margin");
-		return -EIO;
-	}
-
-	scan_cfg.active_dwell = cfg->nActiveMaxChnTime;
-	scan_cfg.passive_dwell = cfg->nPassiveMaxChnTime;
 	/* convert to ms */
 	scan_cfg.scan_cache_aging_time =
 		cfg->scanAgingTimeout * 1000;
-	ucfg_mlme_is_roam_prefer_5ghz(hdd_ctx->psoc, &roam_prefer_5ghz);
-	scan_cfg.prefer_5ghz = (uint32_t)roam_prefer_5ghz;
-	scan_cfg.select_5ghz_margin = select_5ghz_margin;
-	ucfg_mlme_get_first_scan_bucket_threshold(hdd_ctx->psoc,
-						  &scan_bucket_thre);
-	scan_cfg.scan_bucket_threshold = (int32_t)scan_bucket_thre;
-	scan_cfg.rssi_cat_gap = cfg->nRssiCatGap;
-	scan_cfg.scan_dwell_time_mode = cfg->scan_adaptive_dwell_mode;
 	scan_cfg.is_snr_monitoring_enabled = cfg->fEnableSNRMonitoring;
-	scan_cfg.usr_cfg_probe_rpt_time = cfg->scan_probe_repeat_time;
-	scan_cfg.usr_cfg_num_probes = cfg->scan_num_probes;
-	scan_cfg.is_bssid_hint_priority = cfg->is_bssid_hint_priority;
 	scan_cfg.enable_mac_spoofing = cfg->enable_mac_spoofing;
 	status = ucfg_mlme_get_sta_miracast_mcc_rest_time(hdd_ctx->psoc,
 							  &mcast_mcc_rest_time);

core/mac/inc/wni_cfg.h

@@ -25,8 +25,6 @@
 
 enum {
 	WNI_CFG_STA_ID,
-	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
-	WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
 	WNI_CFG_DOT11_MODE,
 	WNI_CFG_VALID_CHANNEL_LIST,
 	WNI_CFG_APSD_ENABLED,

core/mac/src/cfg/cfg_param_name.c

@@ -40,8 +40,6 @@ const char *cfg_get_string(uint16_t cfg_id)
 	default:
 		break;
 	CASE_RETURN_STRING(WNI_CFG_STA_ID);
-	CASE_RETURN_STRING(WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME);
-	CASE_RETURN_STRING(WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME);
 	CASE_RETURN_STRING(WNI_CFG_DOT11_MODE);
 	CASE_RETURN_STRING(WNI_CFG_VALID_CHANNEL_LIST);
 	CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);

core/mac/src/cfg/cfg_proc_msg.c

@@ -29,16 +29,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	{WNI_CFG_STA_ID,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_RELOAD,
 	0, 255, 1},
-	{WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMIN,
-	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMAX,
-	WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STADEF},
-	{WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STAMIN,
-	WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STAMAX,
-	WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STADEF},
 	{WNI_CFG_DOT11_MODE,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | CFG_CTL_RESTART |
 	CFG_CTL_NTF_LIM,

core/sme/inc/csr_api.h

@@ -1019,7 +1019,6 @@ typedef struct tagCsrConfigParam {
 	 * this number minus one is the number of times a scan doesn't find it
 	 * before it is removed
 	 */
-	uint32_t nScanResultAgeCount;
 	/* to set the RSSI difference for each category */
 	uint8_t bCatRssiOffset;
 	/* to set MCC Enable/Disable mode */
@@ -1034,11 +1033,6 @@ typedef struct tagCsrConfigParam {
 	 */
 	uint8_t fAllowMCCGODiffBI;
 	tCsr11dinfo Csr11dinfo;
-
-	uint32_t nPassiveMaxChnTime;        /* in units of milliseconds */
-	uint32_t nActiveMaxChnTime;         /* in units of milliseconds */
-	uint32_t nInitialDwellTime;         /* in units of milliseconds */
-	bool initial_scan_no_dfs_chnl;
 	/*
 	 * in dBm, the maximum TX power The actual TX power is the lesser of
 	 * this value and 11d. If 11d is disable, the lesser of this and
@@ -1068,12 +1062,7 @@ typedef struct tagCsrConfigParam {
 	bool enableVhtFor24GHz;
 	bool vendor_vht_sap;
 	bool send_smps_action;
-	/*
-	 * To enable/disable scanning only 2.4Ghz channels on first scan
-	 */
-	bool fFirstScanOnly2GChnl;
 
-	uint8_t scanCfgAgingTime;
 	uint8_t disable_high_ht_mcs_2x2;
 	uint32_t ho_delay_for_rx;
 	uint32_t min_delay_btw_roam_scans;
@@ -1088,7 +1077,6 @@ typedef struct tagCsrConfigParam {
 	uint8_t conc_custom_rule2;
 	uint8_t is_sta_connection_in_5gz_enabled;
 
-	uint8_t max_scan_count;
 	int8_t first_scan_bucket_threshold;
 	uint8_t max_intf_count;
 	uint32_t f_sta_miracast_mcc_rest_time_val;
@@ -1102,8 +1090,6 @@ typedef struct tagCsrConfigParam {
 	int8_t roam_bg_scan_bad_rssi_thresh;
 	uint8_t roam_bad_rssi_thresh_offset_2g;
 	uint32_t roam_bg_scan_client_bitmap;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc;
 	struct csr_sta_roam_policy_params sta_roam_policy_params;
 	bool enable_bcast_probe_rsp;
 	bool is_fils_enabled;

core/sme/inc/csr_internal.h

@@ -388,18 +388,6 @@ struct csr_config {
 	uint32_t BssPreferValue[CSR_NUM_RSSI_CAT];
 	int RSSICat[CSR_NUM_RSSI_CAT];
 	uint8_t bCatRssiOffset; /* to set RSSI difference for each category */
-	/*
-	 * 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 default channels and
-	 * the channels in the 802.11d IE.
-	 */
-
-	uint32_t nPassiveMaxChnTime;    /* in units of milliseconds */
-	uint32_t nActiveMaxChnTime;     /* in units of milliseconds */
-
-	uint32_t nInitialDwellTime;     /* in units of milliseconds */
-	bool initial_scan_no_dfs_chnl;
 	/*
 	 * in dBm, the max TX power. The actual TX power is the lesser of this
 	 * value & 11d. If 11d is disable, the lesser of this & default setting.
@@ -443,8 +431,6 @@ struct csr_config {
 	uint8_t is_sta_connection_in_5gz_enabled;
 	struct roam_ext_params roam_params;
 	bool vendor_vht_sap;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode;
-	enum scan_dwelltime_adaptive_mode scan_adaptive_dwell_mode_nc;
 	struct csr_sta_roam_policy_params sta_roam_policy;
 	bool enable_bcast_probe_rsp;
 	bool is_fils_enabled;
@@ -486,7 +472,6 @@ struct csr_votes11d {
 
 struct csr_scanstruct {
 	struct scan_profile scanProfile;
-	uint8_t scanResultCfgAgingTime;
 	tSirScanType curScanType;
 	struct csr_channel channels11d;
 	struct channel_power defaultPowerTable[WNI_CFG_VALID_CHANNEL_LIST_LEN];
@@ -516,10 +501,6 @@ struct csr_scanstruct {
 	 * (apprx 1.3 sec)
 	 */
 	uint8_t fEnableDFSChnlScan;
-	/*
-	 * To enable/disable scanning only 2.4Ghz channels on first scan
-	 */
-	bool fFirstScanOnly2GChnl;
 	bool fDropScanCmd;      /* true means we don't accept scan commands */
 
 	/* This includes all channels on which candidate APs are found */
@@ -527,7 +508,6 @@ struct csr_scanstruct {
 	int8_t roam_candidate_count[CSR_ROAM_SESSION_MAX];
 	int8_t inScanResultBestAPRssi;
 	bool fcc_constraint;
-	uint8_t max_scan_count;
 	bool defer_update_channel_list;
 	wlan_scan_requester requester_id;
 };

core/sme/src/csr/csr_api_roam.c

@@ -1669,9 +1669,6 @@ static void init_config_param(struct mac_context *mac)
 		mac->roam.configParam.BssPreferValue[i] = i;
 	csr_assign_rssi_for_category(mac, CSR_BEST_RSSI_VALUE,
 			CSR_DEFAULT_RSSI_DB_GAP);
-	mac->roam.configParam.nActiveMaxChnTime = CSR_ACTIVE_MAX_CHANNEL_TIME;
-	mac->roam.configParam.nPassiveMaxChnTime =
-		CSR_PASSIVE_MAX_CHANNEL_TIME;
 	mac->roam.configParam.nTxPowerCap = CSR_MAX_TX_POWER;
 	mac->roam.configParam.statsReqPeriodicity =
 		CSR_MIN_GLOBAL_STAT_QUERY_PERIOD;
@@ -1686,9 +1683,6 @@ static void init_config_param(struct mac_context *mac)
 	/* Remove this code once SLM_Sessionization is supported */
 	/* BMPS_WORKAROUND_NOT_NEEDED */
 	mac->roam.configParam.doBMPSWorkaround = 0;
-
-	mac->roam.configParam.nInitialDwellTime = 0;
-	mac->roam.configParam.initial_scan_no_dfs_chnl = 0;
 }
 
 enum band_info csr_get_current_band(struct mac_context *mac)
@@ -2515,41 +2509,12 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		mac->roam.configParam.AdHocChannel5G = pParam->AdHocChannel5G;
 		mac->roam.configParam.wep_tkip_in_he = pParam->wep_tkip_in_he;
 
-		/* if HDD passed down non zero values then only update, */
-		/* otherwise keep using the defaults */
-		if (pParam->initial_scan_no_dfs_chnl) {
-			mac->roam.configParam.initial_scan_no_dfs_chnl =
-				pParam->initial_scan_no_dfs_chnl;
-		}
-		if (pParam->nInitialDwellTime) {
-			mac->roam.configParam.nInitialDwellTime =
-				pParam->nInitialDwellTime;
-		}
-		if (pParam->nActiveMaxChnTime) {
-			mac->roam.configParam.nActiveMaxChnTime =
-				pParam->nActiveMaxChnTime;
-			cfg_set_int(mac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
-				    pParam->nActiveMaxChnTime);
-		}
-		if (pParam->nPassiveMaxChnTime) {
-			mac->roam.configParam.nPassiveMaxChnTime =
-				pParam->nPassiveMaxChnTime;
-			cfg_set_int(mac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
-				    pParam->nPassiveMaxChnTime);
-		}
 		mac->roam.configParam.uCfgDot11Mode =
 			csr_get_cfg_dot11_mode_from_csr_phy_mode(NULL,
 							mac->roam.configParam.
 							phyMode,
 							mac->roam.configParam.
 						ProprietaryRatesEnabled);
-		/* if HDD passed down non zero values for age params,
-		 * then only update, otherwise keep using the defaults
-		 */
-		if (pParam->nScanResultAgeCount) {
-			mac->roam.configParam.agingCount =
-				pParam->nScanResultAgeCount;
-		}
 
 		csr_assign_rssi_for_category(mac,
 			mac->mlme_cfg->lfr.first_scan_bucket_threshold,
@@ -2612,10 +2577,7 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		sme_debug("roam_beacon_rssi_weight: %d",
 			  mac->mlme_cfg->lfr.roam_beacon_rssi_weight);
 		mac->scan.fEnableDFSChnlScan = pParam->fEnableDFSChnlScan;
-		mac->scan.scanResultCfgAgingTime = pParam->scanCfgAgingTime;
 		mac->roam.configParam.fScanTwice = pParam->fScanTwice;
-		mac->scan.fFirstScanOnly2GChnl = pParam->fFirstScanOnly2GChnl;
-		mac->scan.max_scan_count = pParam->max_scan_count;
 		/* This parameter is not available in cfg and not passed from
 		 * upper layers. Instead it is initialized here This parametere
 		 * is used in concurrency to determine if there are concurrent
@@ -2658,10 +2620,6 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 
 		mac->roam.configParam.enable_ftopen =
 			pParam->enable_ftopen;
-		mac->roam.configParam.scan_adaptive_dwell_mode =
-			pParam->scan_adaptive_dwell_mode;
-		mac->roam.configParam.scan_adaptive_dwell_mode_nc =
-			pParam->scan_adaptive_dwell_mode_nc;
 
 		/* update interface configuration */
 		mac->sme.max_intf_count = pParam->max_intf_count;
@@ -2751,19 +2709,14 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
 	pParam->ProprietaryRatesEnabled = cfg_params->ProprietaryRatesEnabled;
 	pParam->AdHocChannel24 = cfg_params->AdHocChannel24;
 	pParam->AdHocChannel5G = cfg_params->AdHocChannel5G;
-	pParam->nActiveMaxChnTime = cfg_params->nActiveMaxChnTime;
-	pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime;
-	pParam->nScanResultAgeCount = cfg_params->agingCount;
 	pParam->bCatRssiOffset = cfg_params->bCatRssiOffset;
 	pParam->nTxPowerCap = cfg_params->nTxPowerCap;
 	pParam->statsReqPeriodicity = cfg_params->statsReqPeriodicity;
 	pParam->statsReqPeriodicityInPS = cfg_params->statsReqPeriodicityInPS;
 	pParam->fEnableDFSChnlScan = mac->scan.fEnableDFSChnlScan;
 	pParam->fScanTwice = cfg_params->fScanTwice;
-	pParam->fFirstScanOnly2GChnl = mac->scan.fFirstScanOnly2GChnl;
 	pParam->fEnableMCCMode = cfg_params->fenableMCCMode;
 	pParam->fAllowMCCGODiffBI = cfg_params->fAllowMCCGODiffBI;
-	pParam->scanCfgAgingTime = mac->scan.scanResultCfgAgingTime;
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	pParam->cc_switch_mode = cfg_params->cc_switch_mode;
@@ -2775,8 +2728,6 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
 	pParam->roam_trigger_reason_bitmask =
 			cfg_params->roam_trigger_reason_bitmask;
 	pParam->isCoalesingInIBSSAllowed = cfg_params->isCoalesingInIBSSAllowed;
-	pParam->nInitialDwellTime = cfg_params->nInitialDwellTime;
-	pParam->initial_scan_no_dfs_chnl = cfg_params->initial_scan_no_dfs_chnl;
 	csr_set_channels(mac, pParam);
 	pParam->obssEnabled = cfg_params->obssEnabled;
 	pParam->vendor_vht_sap =
@@ -2792,16 +2743,10 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
 		cfg_params->roam_params.roam_bad_rssi_thresh_offset_2g;
 
 	pParam->enable_ftopen = cfg_params->enable_ftopen;
-	pParam->scan_adaptive_dwell_mode =
-			cfg_params->scan_adaptive_dwell_mode;
-	pParam->scan_adaptive_dwell_mode_nc =
-			cfg_params->scan_adaptive_dwell_mode_nc;
-
 	pParam->conc_custom_rule1 = cfg_params->conc_custom_rule1;
 	pParam->conc_custom_rule2 = cfg_params->conc_custom_rule2;
 	pParam->is_sta_connection_in_5gz_enabled =
 		cfg_params->is_sta_connection_in_5gz_enabled;
-	pParam->max_scan_count = mac->scan.max_scan_count;
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
 	pParam->sap_channel_avoidance = mac->sap.sap_channel_avoidance;
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */

core/sme/src/rrm/sme_rrm.c

@@ -793,30 +793,26 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 		 */
 		if (eRRM_MSG_SOURCE_ESE_UPLOAD == sme_rrm_ctx->msgSource ||
 			eRRM_MSG_SOURCE_LEGACY_ESE == sme_rrm_ctx->msgSource)
-			req->scan_req.dwell_time_active = sme_rrm_ctx->duration[
-						sme_rrm_ctx->currentIndex];
+			max_chan_time =
+			      sme_rrm_ctx->duration[sme_rrm_ctx->currentIndex];
 		else
-			req->scan_req.dwell_time_active =
-						sme_rrm_ctx->duration[0];
+			max_chan_time = sme_rrm_ctx->duration[0];
 
-		sme_debug("Scan Type(%d) Max Dwell Time(%d)",
-				scan_type,
-				req->scan_req.dwell_time_active);
 		/*
-		 * Use gPassive/gActiveMaxChannelTime if maxChanTime is less
-		 * than default.
+		 * Use max_chan_time if max_chan_time is more than def value
+		 * depending on type of scan.
 		 */
-		if (eSIR_ACTIVE_SCAN == scan_type)
-			max_chan_time =
-				mac_ctx->roam.configParam.nActiveMaxChnTime;
-		else
-			max_chan_time =
-				mac_ctx->roam.configParam.nPassiveMaxChnTime;
-
-		if (req->scan_req.dwell_time_active < max_chan_time) {
-			req->scan_req.dwell_time_active = max_chan_time;
-			sme_debug("Setting default max %d ChanTime",
-				max_chan_time);
+		if (req->scan_req.scan_f_passive) {
+			if (max_chan_time > req->scan_req.dwell_time_passive)
+				req->scan_req.dwell_time_passive =
+								max_chan_time;
+			sme_debug("Passive Max Dwell Time(%d)",
+				  req->scan_req.dwell_time_passive);
+		} else {
+			if (max_chan_time > req->scan_req.dwell_time_active)
+				req->scan_req.dwell_time_active = max_chan_time;
+			sme_debug("Active Max Dwell Time(%d)",
+				  req->scan_req.dwell_time_active);
 		}
 
 		req->scan_req.adaptive_dwell_time_mode = SCAN_DWELL_MODE_STATIC;

core/wma/src/wma_scan_roam.c

@@ -950,7 +950,6 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle,
 				    scan_params)
 {
 	uint8_t channels_per_burst = 0;
-	uint32_t val = 0;
 
 	if (NULL == mac) {
 		WMA_LOGE("%s: mac is NULL", __func__);
@@ -975,32 +974,8 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle,
 			 roam_req->neighbor_scan_min_timer_period,
 			 roam_req->HomeAwayTime, roam_req->nProbes);
 
-		/*
-		 * roam_req->NeighborScanChannelMaxTime = SCAN_CHANNEL_TIME
-		 * roam_req->HomeAwayTime               = SCAN_HOME_AWAY_TIME
-		 * roam_req->NeighborScanTimerPeriod    = SCAN_HOME_TIME
-		 *
-		 * scan_params->dwell_time_active :time station stays on channel
-		 *                                   and sends probes;
-		 * scan_params->dwell_time_passive:time station stays on channel
-		 *                                   and listens probes;
-		 * scan_params->burst_duration    :time station goes off channel
-		 *                                   to scan;
-		 */
-
-		if (wlan_cfg_get_int
-			    (mac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
-			    &val) != QDF_STATUS_SUCCESS) {
-			/*
-			 * Could not get max channel value from CFG. Log error.
-			 */
-			WMA_LOGE("could not retrieve passive max channel value");
-
-			/* use a default value of 110ms */
-			val = WMA_ROAM_DWELL_TIME_PASSIVE_DEFAULT;
-		}
-
-		scan_params->dwell_time_passive = val;
+		wlan_scan_cfg_get_passive_dwelltime(wma_handle->psoc,
+					&scan_params->dwell_time_passive);
 		/*
 		 * Here is the formula,
 		 * T(HomeAway) = N * T(dwell) + (N+1) * T(cs)