qcacld-3.0: Add INI/IOCTL template for Scan functionality

Add INI and IOCTL template for Scan functionality for
documentation.

Change-Id: I8a12d9f8ae964e84fdad32b96634fbdea51bd739
CRs-Fixed: 1113968

2 files changed, 1066 insertions, 308 deletions

diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 6e613c9156b3..f4056f3899c9 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -338,28 +338,116 @@ typedef enum {
 #define CFG_SHORT_GI_20MHZ_MAX                 WNI_CFG_SHORT_GI_20MHZ_STAMAX
 #define CFG_SHORT_GI_20MHZ_DEFAULT             WNI_CFG_SHORT_GI_20MHZ_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)
 
-/* All in seconds */
-/* Not Connect, No Power Save */
+/*
+ * <ini>
+ * gScanResultAgeNCNPS - Set scan result aging time NCNPS
+ * @Min: 10
+ * @Max: 10000
+ * @Default: 50
+ *
+ * This ini is used to set scan result aging time threshold
+ * in secs when Not-Connect-No-PowerSave.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
 #define CFG_SCAN_RESULT_AGE_TIME_NCNPS_NAME    "gScanResultAgeNCNPS"
 #define CFG_SCAN_RESULT_AGE_TIME_NCNPS_MIN     (10)
 #define CFG_SCAN_RESULT_AGE_TIME_NCNPS_MAX     (10000)
 #define CFG_SCAN_RESULT_AGE_TIME_NCNPS_DEFAULT (50)
-/* Not Connect, Power Save */
+
+/*
+ * <ini>
+ * gScanResultAgeNCPS - Set scan result aging time NCPS
+ * @Min: 10
+ * @Max: 10000
+ * @Default: 300
+ *
+ * This ini is used to set scan result aging time threshold
+ * in secs when Not-Connect-PowerSave.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
 #define CFG_SCAN_RESULT_AGE_TIME_NCPS_NAME     "gScanResultAgeNCPS"
 #define CFG_SCAN_RESULT_AGE_TIME_NCPS_MIN      (10)
 #define CFG_SCAN_RESULT_AGE_TIME_NCPS_MAX      (10000)
 #define CFG_SCAN_RESULT_AGE_TIME_NCPS_DEFAULT  (300)
-/* Connect, No Power Save */
+
+/*
+ * <ini>
+ * gScanResultAgeCNPS - Set scan result aging time CNPS
+ * @Min: 10
+ * @Max: 10000
+ * @Default: 150
+ *
+ * This ini is used to set scan result aging time threshold
+ * in secs when Connect-No-PowerSave.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
 #define CFG_SCAN_RESULT_AGE_TIME_CNPS_NAME     "gScanResultAgeCNPS"
 #define CFG_SCAN_RESULT_AGE_TIME_CNPS_MIN      (10)
 #define CFG_SCAN_RESULT_AGE_TIME_CNPS_MAX      (10000)
 #define CFG_SCAN_RESULT_AGE_TIME_CNPS_DEFAULT  (150)
-/* Connect, Power Save */
+
+/*
+ * <ini>
+ * gScanResultAgeCPS - Set scan result aging time CPS
+ * @Min: 10
+ * @Max: 10000
+ * @Default: 600
+ *
+ * This ini is used to set scan result aging time threshold
+ * in secs when Connect-PowerSave.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
 #define CFG_SCAN_RESULT_AGE_TIME_CPS_NAME      "gScanResultAgeCPS"
 #define CFG_SCAN_RESULT_AGE_TIME_CPS_MIN       (10)
 #define CFG_SCAN_RESULT_AGE_TIME_CPS_MAX       (10000)
@@ -367,6 +455,943 @@ typedef enum {
 
 /*
  * <ini>
+ * gNeighborScanTimerPeriod - Set neighbor scan timer period
+ * @Min: 3
+ * @Max: 300
+ * @Default: 200
+ *
+ * This ini is used to set the timer period in secs after
+ * which neighbor scan is trigerred.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME             "gNeighborScanTimerPeriod"
+#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN              (3)
+#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX              (300)
+#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_DEFAULT          (200)
+
+/*
+ * <ini>
+ * gOpportunisticThresholdDiff - Set oppurtunistic threshold diff
+ * @Min: 0
+ * @Max: 127
+ * @Default: 0
+ *
+ * This ini is used to set opportunistic threshold diff.
+ * This parameter is the RSSI diff above neighbor lookup
+ * threshold, when opportunistic scan should be triggered.
+ * MAX value is choosen so that this type of scan can be
+ * always enabled by user.
+ * MIN value will cause opportunistic scan to be triggered
+ * in neighbor lookup RSSI range.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_NAME            "gOpportunisticThresholdDiff"
+#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_MIN             (0)
+#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_MAX             (127)
+#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_DEFAULT         (0)
+
+/*
+ * <ini>
+ * gNeighborScanChannelList - Set channels to be scanned
+ * by firmware for LFR scan
+ * @Default: ""
+ *
+ * This ini is used to set the channels to be scanned
+ * by firmware for LFR scan.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_NEIGHBOR_SCAN_CHAN_LIST_NAME             "gNeighborScanChannelList"
+#define CFG_NEIGHBOR_SCAN_CHAN_LIST_DEFAULT          ""
+
+/*
+ * <ini>
+ * gNeighborScanChannelMinTime - Set neighbor scan channel min time
+ * @Min: 10
+ * @Max: 40
+ * @Default: 20
+ *
+ * This ini is used to set the minimum time in secs spent on each
+ * channel in LFR scan inside firmware.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_NAME      "gNeighborScanChannelMinTime"
+#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN       (10)
+#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX       (40)
+#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_DEFAULT   (20)
+
+/*
+ * <ini>
+ * gNeighborScanChannelMaxTime - Set neighbor scan channel max time
+ * @Min: 3
+ * @Max: 300
+ * @Default: 30
+ *
+ * This ini is used to set the maximum time in secs spent on each
+ * channel in LFR scan inside firmware.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_NAME      "gNeighborScanChannelMaxTime"
+#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN       (3)
+#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX       (300)
+#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_DEFAULT   (30)
+
+/*
+ * <ini>
+ * gNeighborScanRefreshPeriod - Set neighbor scan refresh period
+ * @Min: 1000
+ * @Max: 60000
+ * @Default: 20000
+ *
+ * This ini is used by firmware to set scan refresh period
+ * in msecs for lfr scan.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_NAME         "gNeighborScanRefreshPeriod"
+#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN          (1000)
+#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX          (60000)
+#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_DEFAULT      (20000)
+
+/*
+ * <ini>
+ * gEmptyScanRefreshPeriod - Set empty scan refresh period
+ * @Min: 0
+ * @Max: 60000
+ * @Default: 0
+ *
+ * This ini is used by firmware to set scan period in msecs
+ * following empty scan results.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EMPTY_SCAN_REFRESH_PERIOD_NAME         "gEmptyScanRefreshPeriod"
+#define CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN          (0)
+#define CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX          (60000)
+#define CFG_EMPTY_SCAN_REFRESH_PERIOD_DEFAULT      (0)
+
+/*
+ * <ini>
+ * gEnableDFSChnlScan - Enable DFS channel scan
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to enable or disable DFS channel
+ * scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_ENABLE_DFS_CHNL_SCAN_NAME              "gEnableDFSChnlScan"
+#define CFG_ENABLE_DFS_CHNL_SCAN_MIN               (0)
+#define CFG_ENABLE_DFS_CHNL_SCAN_MAX               (1)
+#define CFG_ENABLE_DFS_CHNL_SCAN_DEFAULT           (1)
+
+/*
+ * <ini>
+ * gEnableDFSPnoChnlScan - Enable DFS PNO channel scan
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to enable or disable DFS channel
+ * for PNO scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_NAME              "gEnableDFSPnoChnlScan"
+#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MIN               (0)
+#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
+ * @Min: 0
+ * @Max: 200
+ * @Default: 30
+ *
+ * This ini is used to set scan aging timeout value
+ * in secs. For example after 30 secs the bss results
+ * greater than 30secs age will be flushed.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_SCAN_AGING_PARAM_NAME          "gScanAgingTime"
+#define CFG_SCAN_AGING_PARAM_MIN           (0)
+#define CFG_SCAN_AGING_PARAM_MAX           (200)
+#define CFG_SCAN_AGING_PARAM_DEFAULT       (30)
+
+#ifdef FEATURE_WLAN_SCAN_PNO
+/*
+ * <ini>
+ * gPNOScanSupport - Enable or Disable PNO scan
+ * @Min: 1
+ * @Max: 0
+ * @Default: 1
+ *
+ * This ini is used to Enable or Disable PNO scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_PNO_SCAN_SUPPORT                         "gPNOScanSupport"
+#define CFG_PNO_SCAN_SUPPORT_ENABLE                  (1)
+#define CFG_PNO_SCAN_SUPPORT_DISABLE                 (0)
+#define CFG_PNO_SCAN_SUPPORT_DEFAULT                 (1)
+
+/*
+ * <ini>
+ * gPNOScanTimerRepeatValue - Set PNO scan timer repeat value
+ * @Min: 30
+ * @Max: 0
+ * @Default: 0xffffffff
+ *
+ * This ini is used by firmware to set fast scan max cycles
+ * equal to gPNOScanTimerRepeatValue. Taking power consumption
+ * into account firmware after gPNOScanTimerRepeatValue times
+ * fast_scan_period switches to slow_scan_period.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE              "gPNOScanTimerRepeatValue"
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_DEFAULT      (30)
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MIN          (0)
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MAX          (0xffffffff)
+
+/*
+ * <ini>
+ * gPNOSlowScanMultiplier - Set PNO slow scan multiplier
+ * @Min: 6
+ * @Max: 0
+ * @Default: 30
+ *
+ * This ini is used by firmware to set slow scan period
+ * as gPNOSlowScanMultiplier times fast_scan_period.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_PNO_SLOW_SCAN_MULTIPLIER                 "gPNOSlowScanMultiplier"
+#define CFG_PNO_SLOW_SCAN_MULTIPLIER_DEFAULT         (6)
+#define CFG_PNO_SLOW_SCAN_MULTIPLIER_MIN             (0)
+#define CFG_PNO_SLOW_SCAN_MULTIPLIER_MAX             (30)
+#endif
+
+/*
+ * <ini>
+ * max_scan_count - Set maximum number of scans
+ * @Min: 1
+ * @Max: 8
+ * @Default: 4
+ *
+ * This ini is used to set the maximum number of
+ * scans that host can queue at firmware.
+ * Rome firmware support 8 scan queue size and 4
+ * are reserved for internal scan requests like
+ * roaming. So host can send 4 scan requests.
+ * In iHelium, there is no constraint in number of
+ * scan queue size at firmware but the current use
+ * cases needs support of maximum of 4 scan request
+ * from host.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_MAX_SCAN_COUNT_NAME           "max_scan_count"
+#define CFG_MAX_SCAN_COUNT_MIN            (1)
+#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>
+ * gPassiveMinChannelTime - Set min channel time for passive scan
+ * @Min: 0
+ * @Max: 10000
+ * @Default: 60
+ *
+ * This ini is used to set minimum channel time in secs spent in
+ * passive scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_PASSIVE_MIN_CHANNEL_TIME_NAME      "gPassiveMinChannelTime"
+#define CFG_PASSIVE_MIN_CHANNEL_TIME_MIN       (0)
+#define CFG_PASSIVE_MIN_CHANNEL_TIME_MAX       (10000)
+#define CFG_PASSIVE_MIN_CHANNEL_TIME_DEFAULT   (60)
+
+/*
+ * <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>
+ * gActiveMinChannelTime - Set min channel time for active scan
+ * @Min: 0
+ * @Max: 10000
+ * @Default: 20
+ *
+ * This ini is used to set minimum channel time in secs spent in
+ * active scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_NAME       "gActiveMinChannelTime"
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_MIN        (0)
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_MAX        (10000)
+#define CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT    (20)
+
+#ifdef FEATURE_WLAN_EXTSCAN
+/*
+ * <ini>
+ * gExtScanEnable - Enable external scan
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to control enabling of external scan
+ * feature.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EXTSCAN_ALLOWED_NAME                   "gExtScanEnable"
+#define CFG_EXTSCAN_ALLOWED_MIN                    (0)
+#define CFG_EXTSCAN_ALLOWED_MAX                    (1)
+#define CFG_EXTSCAN_ALLOWED_DEF                    (1)
+
+/*
+ * <ini>
+ * gExtScanPassiveMaxChannelTime - Set max channel time for external
+ * passive scan
+ * @Min: 0
+ * @Max: 500
+ * @Default: 110
+ *
+ * This ini is used to set maximum channel time  in secs spent in
+ * external passive scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_NAME      "gExtScanPassiveMaxChannelTime"
+#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_MIN       (0)
+#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_MAX       (500)
+#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_DEFAULT   (110)
+
+/*
+ * <ini>
+ * gExtScanPassiveMinChannelTime - Set min channel time for external
+ * passive scan
+ * @Min: 0
+ * @Max: 500
+ * @Default: 60
+ *
+ * This ini is used to set minimum channel time in secs spent in
+ * external passive scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_NAME      "gExtScanPassiveMinChannelTime"
+#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_MIN       (0)
+#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_MAX       (500)
+#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_DEFAULT   (60)
+
+/*
+ * <ini>
+ * gExtScanActiveMaxChannelTime - Set min channel time for external
+ * active scan
+ * @Min: 0
+ * @Max: 110
+ * @Default: 40
+ *
+ * This ini is used to set maximum channel time in secs spent in
+ * external active scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_NAME       "gExtScanActiveMaxChannelTime"
+#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_MIN        (0)
+#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_MAX        (110)
+#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_DEFAULT    (40)
+
+/*
+ * <ini>
+ * gExtScanActiveMinChannelTime - Set min channel time for external
+ * active scan
+ * @Min: 0
+ * @Max: 110
+ * @Default: 20
+ *
+ * This ini is used to set minimum channel time in secs spent in
+ * external active scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_NAME       "gExtScanActiveMinChannelTime"
+#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_MIN        (0)
+#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_MAX        (110)
+#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_DEFAULT    (20)
+#endif
+
+/*
+ * <ini>
+ * gChPredictionFullScanMs - Set periodic timer for channel
+ * prediction
+ * @Min: 3000
+ * @Max: 0x7fffffff
+ * @Default: 60000
+ *
+ * This ini is used to set the periodic timer upon which
+ * a full scan needs to be triggered when PNO channel
+ * prediction feature is enabled. This parameter is intended
+ * to tweak the internal algortihm for experiments.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: Internal
+ *
+ * </ini>
+ */
+#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_NAME      "gChPredictionFullScanMs"
+#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_MIN       (30000)
+#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_MAX       (0x7fffffff)
+#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_DEFAULT   (60000)
+
+/*
+ * <ini>
+ * gEnableEarlyStopScan - Set early stop scan
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini is used to set early stop scan. Early stop
+ * scan is a feature for roaming to stop the scans at
+ * an early stage as soon as we find a better AP to roam.
+ * This would make the roaming happen quickly.
+ *
+ * Related: None
+ *
+ * Supported Feature: LFR Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EARLY_STOP_SCAN_ENABLE           "gEnableEarlyStopScan"
+#define CFG_EARLY_STOP_SCAN_ENABLE_MIN       (0)
+#define CFG_EARLY_STOP_SCAN_ENABLE_MAX       (1)
+#define CFG_EARLY_STOP_SCAN_ENABLE_DEFAULT   (1)
+
+/*
+ * <ini>
+ * gEarlyStopScanMinThreshold - Set early stop scan min
+ * threshold
+ * @Min: -80
+ * @Max: -70
+ * @Default: -73
+ *
+ * This ini is used to set the early stop scan minimum
+ * threshold. Early stop scan minimum threshold is the
+ * minimum threshold to be considered for stopping the
+ * scan. The algorithm starts with a scan on the greedy
+ * channel list with the maximum threshold and steps down
+ * the threshold by 20% for each further channel. It can
+ * step down on each channel but cannot go lower than the
+ * minimum threshold.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD           "gEarlyStopScanMinThreshold"
+#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_MIN       (-80)
+#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_MAX       (-70)
+#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_DEFAULT   (-73)
+
+/*
+ * <ini>
+ * gEarlyStopScanMaxThreshold - Set early stop scan max
+ * threshold
+ * @Min: -60
+ * @Max: -40
+ * @Default: -43
+ *
+ * This ini is used to set the the early stop scan maximum
+ * threshold at which the candidate AP should be to be
+ * qualified as a potential roam candidate and good enough
+ * to stop the roaming scan.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD           "gEarlyStopScanMaxThreshold"
+#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_MIN       (-60)
+#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_MAX       (-40)
+#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_DEFAULT   (-43)
+
+/*
+ * <ini>
+ * gFirstScanBucketThreshold - Set first scan bucket
+ * threshold
+ * @Min: -50
+ * @Max: -30
+ * @Default: -30
+ *
+ * This ini will configure the first scan bucket
+ * threshold to the mentioned value and all the AP's which
+ * have RSSI under this threshold will fall under this
+ * bucket. This configuration item used to tweak and
+ * test the input for internal algorithm.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: Internal
+ *
+ * </ini>
+ */
+#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_NAME      "gFirstScanBucketThreshold"
+#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_MIN       (-50)
+#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_MAX       (-30)
+#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_DEFAULT   (-30)
+
+/*
+ * <ini>
+ * obss_active_dwelltime - Set obss active dwelltime
+ * @Min: 5
+ * @Max: 1000
+ * @Default: 10
+ *
+ * This ini is used to set dwell time in secs for active
+ * obss scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_NAME    "obss_active_dwelltime"
+#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MIN     (5)
+#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MAX     (1000)
+#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_DEFAULT (10)
+
+/*
+ * <ini>
+ * obss_passive_dwelltime - Set obss passive dwelltime
+ * @Min: 10
+ * @Max: 1000
+ * @Default: 20
+ *
+ * This ini is used to set dwell time in secs for passive
+ * obss scan
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_NAME    "obss_passive_dwelltime"
+#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MIN     (10)
+#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MAX     (1000)
+#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_DEFAULT (20)
+
+/*
+ * <ini>
+ * obss_width_trigger_interval - Set obss trigger interval
+ * @Min: 10
+ * @Max: 900
+ * @Default: 200
+ *
+ * This ini is used during an OBSS scan operation,
+ * where each channel in the set is scanned at least
+ * once per configured trigger interval time.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_NAME    "obss_width_trigger_interval"
+#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MIN     (10)
+#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MAX     (900)
+#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_DEFAULT (200)
+
+/*
+ * <ini>
+ * gbug_report_for_scan_results - Enable bug report
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to create bug report in
+ * case of nil scan results.
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_CREATE_BUG_REPORT_FOR_SCAN       "gbug_report_for_scan_results"
+#define CFG_CREATE_BUG_REPORT_FOR_SCAN_DISABLE    (0)
+#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
+ * @Min: 0
+ * @Max: 4
+ * @Default: 0
+ *
+ * This ini will set the algo used in dwell time optimization
+ * during host scan. see enum wmi_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     (0)
+
+/*
+ * <ini>
+ * extscan_adaptive_dwell_mode - Enable adaptive dwell mode
+ * during ext scan
+ * @Min: 0
+ * @Max: 4
+ * @Default: 0
+ *
+ * This ini will set the algo used in dwell time optimization
+ * during ext scan. see enum wmi_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_EXTSCAN_DWELL_MODE_NAME     "extscan_adaptive_dwell_mode"
+#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_MIN      (0)
+#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_MAX      (4)
+#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_DEFAULT  (0)
+
+/*
+ * <ini>
+ * pnoscan_adaptive_dwell_mode - Enable adaptive dwell mode
+ * during pno scan
+ * @Min: 0
+ * @Max: 4
+ * @Default: 0
+ *
+ * This ini will set the algo used in dwell time optimization
+ * during pno scan. see enum wmi_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_PNOSCAN_DWELL_MODE_NAME     "pnoscan_adaptive_dwell_mode"
+#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_MIN      (0)
+#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_MAX      (4)
+#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_DEFAULT  (0)
+
+/*
+ * <ini>
+ * adaptive_dwell_mode_enabled - Enable adaptive dwell mode
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This parameter will globally disable/enable the adaptive dwell config.
+ * Following parameters will set different values of attributes for dwell
+ * time optimization thus reducing total scan time.
+ * Acceptable values for this:
+ * 0: Config is disabled
+ * 1: Config is enabled
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_NAME      "adaptive_dwell_mode_enabled"
+#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_MIN       (0)
+#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_MAX       (1)
+#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_DEFAULT   (1)
+
+/*
+ * <ini>
+ * global_adapt_dwelltime_mode - Set default adaptive mode
+ * @Min: 0
+ * @Max: 4
+ * @Default: 1
+ *
+ * This parameter will set default adaptive mode, will be used if any of the
+ * scan dwell mode is set to default.
+ * For uses : see enum wmi_dwelltime_adaptive_mode
+ *
+ * Related: None
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_NAME       "global_adapt_dwelltime_mode"
+#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_MIN        (0)
+#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_MAX        (4)
+#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_DEFAULT    (1)
+
+/*
  * gRssiCatGap - Set Rssi CatGap
  * @Min: 5
  * @Max: 100
@@ -1595,26 +2620,6 @@ typedef enum {
 #define CFG_VCC_UL_MAC_LOSS_THRESH_MAX        (9)
 #define CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT    (9)
 
-#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)
-
-#define CFG_PASSIVE_MIN_CHANNEL_TIME_NAME      "gPassiveMinChannelTime"
-#define CFG_PASSIVE_MIN_CHANNEL_TIME_MIN       (0)
-#define CFG_PASSIVE_MIN_CHANNEL_TIME_MAX       (10000)
-#define CFG_PASSIVE_MIN_CHANNEL_TIME_DEFAULT   (60)
-
-#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)
-
-#define CFG_ACTIVE_MIN_CHANNEL_TIME_NAME       "gActiveMinChannelTime"
-#define CFG_ACTIVE_MIN_CHANNEL_TIME_MIN        (0)
-#define CFG_ACTIVE_MIN_CHANNEL_TIME_MAX        (10000)
-#define CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT    (20)
-
 #define CFG_RETRY_LIMIT_ZERO_NAME       "gRetryLimitZero"
 #define CFG_RETRY_LIMIT_ZERO_MIN        (0)
 #define CFG_RETRY_LIMIT_ZERO_MAX        (15)
@@ -2979,11 +3984,6 @@ typedef enum {
 #define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_MAX        (255)
 #define CFG_TELE_BCN_MAX_LI_NUM_IDLE_BCNS_DEFAULT    (15)
 
-#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME             "gNeighborScanTimerPeriod"
-#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN              (3)
-#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX              (300)
-#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_DEFAULT          (200)
-
 #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_NAME      "gNeighborLookupThreshold"
 #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN       (10)
 #define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX       (120)
@@ -2994,46 +3994,11 @@ typedef enum {
 #define CFG_DELAY_BEFORE_VDEV_STOP_MAX               (200)
 #define CFG_DELAY_BEFORE_VDEV_STOP_DEFAULT           (20)
 
-/*
- * This parameter is the RSSI diff above neighbor lookup threshold, when
- * opportunistic scan should be triggered.
- * MAX value is choose so that this type of scan can be always enabled by user.
- * MIN value will cause opportunistic scan to be triggered in neighbor lookup
- * RSSI range.
- */
-#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_NAME            "gOpportunisticThresholdDiff"
-#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_MIN             (0)
-#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_MAX             (127)
-#define CFG_OPPORTUNISTIC_SCAN_THRESHOLD_DIFF_DEFAULT         (0)
-
-#define CFG_NEIGHBOR_SCAN_CHAN_LIST_NAME                      "gNeighborScanChannelList"
-#define CFG_NEIGHBOR_SCAN_CHAN_LIST_DEFAULT                   ""
-
-#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_NAME                  "gNeighborScanChannelMinTime"
-#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN                   (10)
-#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX                   (40)
-#define CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_DEFAULT               (20)
-
-#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_NAME                  "gNeighborScanChannelMaxTime"
-#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN                   (3)
-#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX                   (300)
-#define CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_DEFAULT               (30)
-
 #define CFG_11R_NEIGHBOR_REQ_MAX_TRIES_NAME           "gMaxNeighborReqTries"
 #define CFG_11R_NEIGHBOR_REQ_MAX_TRIES_MIN            (1)
 #define CFG_11R_NEIGHBOR_REQ_MAX_TRIES_MAX            (4)
 #define CFG_11R_NEIGHBOR_REQ_MAX_TRIES_DEFAULT        (3)
 
-#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_NAME         "gNeighborScanRefreshPeriod"
-#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN          (1000)
-#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX          (60000)
-#define CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_DEFAULT      (20000)
-
-#define CFG_EMPTY_SCAN_REFRESH_PERIOD_NAME         "gEmptyScanRefreshPeriod"
-#define CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN          (0)
-#define CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX          (60000)
-#define CFG_EMPTY_SCAN_REFRESH_PERIOD_DEFAULT      (0)
-
 #define CFG_ROAM_BMISS_FIRST_BCNT_NAME                  "gRoamBmissFirstBcnt"
 #define CFG_ROAM_BMISS_FIRST_BCNT_MIN                   (5)
 #define CFG_ROAM_BMISS_FIRST_BCNT_MAX                   (100)
@@ -4182,17 +5147,6 @@ typedef enum {
 #define CFG_ENABLE_DYNAMIC_DTIM_DEFAULT    (0)
 
 /*
- * Enable First Scan 2G Only
- * Options
- * 0 - Disable First Scan 2G Option
- * 1 - Enable First Scan 2G Option
- */
-#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)
-
-/*
  * Driver Force ACS is reintroduced for android SAP legacy configuration method.
  * If Driver force acs is enabled, channel/ hw config from hostapd is ignored.
  * Driver uses INI params dot11Mode, channel bonding mode and vht chan width
@@ -5272,14 +6226,6 @@ typedef enum {
 #define CFG_ENABLE_LPWR_IMG_TRANSITION_MAX         (1)
 #define CFG_ENABLE_LPWR_IMG_TRANSITION_DEFAULT     (0)
 
-/*
- * Scan Aging timeout value in seconds
- */
-#define CFG_SCAN_AGING_PARAM_NAME          "gScanAgingTime"
-#define CFG_SCAN_AGING_PARAM_MIN           (0)
-#define CFG_SCAN_AGING_PARAM_MAX           (200)
-#define CFG_SCAN_AGING_PARAM_DEFAULT       (30)
-
 /* Config Param to enable the txLdpc capability
  * 0 - disable
  * 1 - HT LDPC enable
@@ -5468,23 +6414,6 @@ typedef enum {
 #define CFG_ENABLE_SNR_MONITORING_MAX               (1)
 #define CFG_ENABLE_SNR_MONITORING_DEFAULT           (0)
 
-#ifdef FEATURE_WLAN_SCAN_PNO
-#define CFG_PNO_SCAN_SUPPORT                         "gPNOScanSupport"
-#define CFG_PNO_SCAN_SUPPORT_ENABLE                  (1)
-#define CFG_PNO_SCAN_SUPPORT_DISABLE                 (0)
-#define CFG_PNO_SCAN_SUPPORT_DEFAULT                 (1)
-
-#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE              "gPNOScanTimerRepeatValue"
-#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_DEFAULT      (30)
-#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MIN          (0)
-#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MAX          (0xffffffff)
-
-#define CFG_PNO_SLOW_SCAN_MULTIPLIER                 "gPNOSlowScanMultiplier"
-#define CFG_PNO_SLOW_SCAN_MULTIPLIER_DEFAULT         (6)
-#define CFG_PNO_SLOW_SCAN_MULTIPLIER_MIN             (0)
-#define CFG_PNO_SLOW_SCAN_MULTIPLIER_MAX             (30)
-#endif
-
 /*
  * <ini>
  * gMaxAmsduNum - Max number of MSDU's in aggregate
@@ -6976,23 +7905,6 @@ typedef enum {
 #define CFG_FINE_TIME_MEAS_CAPABILITY_MAX          (0x00BD)
 #define CFG_FINE_TIME_MEAS_CAPABILITY_DEFAULT      (0x000D)
 
-/*
- * Maximum number of scans that host can queue at firmware is controlled
- * through the configuration item  'max_scan_count'.
- *
- * Rome - Rome firmware support 8 scan queue size and 4 are reserved
- * for internal scan requests like roaming. So host can send 4
- * scan requests.
- *
- * ihelium - There is no constraint in number of scan queue size at
- * firmware but the current uses cases needs support of maximum
- * of 4 scan request from host.
- */
-#define CFG_MAX_SCAN_COUNT_NAME           "max_scan_count"
-#define CFG_MAX_SCAN_COUNT_MIN            (1)
-#define CFG_MAX_SCAN_COUNT_MAX            (8)
-#define CFG_MAX_SCAN_COUNT_DEFAULT        (4)
-
 /**
  * enum dot11p_mode - The 802.11p mode of operation
  * @WLAN_HDD_11P_DISABLED:   802.11p mode is disabled
@@ -7010,38 +7922,6 @@ enum dot11p_mode {
 #define CFG_DOT11P_MODE_MIN              (WLAN_HDD_11P_DISABLED)
 #define CFG_DOT11P_MODE_MAX              (WLAN_HDD_11P_CONCURRENT)
 
-#ifdef FEATURE_WLAN_EXTSCAN
-
-/*
- * This ini is added to control the enabling of extscan feature outside of code.
- * By default extscan feature will be enabled, to disable extscan add
- * gExtScanEnable=0 in ini file.
- */
-#define CFG_EXTSCAN_ALLOWED_NAME                   "gExtScanEnable"
-#define CFG_EXTSCAN_ALLOWED_MIN                    (0)
-#define CFG_EXTSCAN_ALLOWED_MAX                    (1)
-#define CFG_EXTSCAN_ALLOWED_DEF                    (1)
-
-#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_NAME      "gExtScanPassiveMaxChannelTime"
-#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_MIN       (0)
-#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_MAX       (500)
-#define CFG_EXTSCAN_PASSIVE_MAX_CHANNEL_TIME_DEFAULT   (110)
-
-#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_NAME      "gExtScanPassiveMinChannelTime"
-#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_MIN       (0)
-#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_MAX       (500)
-#define CFG_EXTSCAN_PASSIVE_MIN_CHANNEL_TIME_DEFAULT   (60)
-
-#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_NAME       "gExtScanActiveMaxChannelTime"
-#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_MIN        (0)
-#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_MAX        (110)
-#define CFG_EXTSCAN_ACTIVE_MAX_CHANNEL_TIME_DEFAULT    (40)
-
-#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_NAME       "gExtScanActiveMinChannelTime"
-#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_MIN        (0)
-#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_MAX        (110)
-#define CFG_EXTSCAN_ACTIVE_MIN_CHANNEL_TIME_DEFAULT    (20)
-#endif
 /*
  * <ini>
  * gEnable_go_cts2self_for_sta - Indicate firmware to stop NOA and
@@ -7130,61 +8010,6 @@ enum dot11p_mode {
 #define CFG_STATIONARY_THRESHOLD_MIN       (0)
 #define CFG_STATIONARY_THRESHOLD_MAX       (100)
 #define CFG_STATIONARY_THRESHOLD_DEFAULT   (10)
-/*
- * The following parameter is the periodic timer upon which
- * a full scan needs to be triggered when PNO channel prediction
- * feature is enabled. This parameter is intended to tweak the
- * internal algortihm for experiments. This should not be changed
- * externally.
- */
-#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_NAME      "gChPredictionFullScanMs"
-#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_MIN       (30000)
-#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_MAX       (0x7fffffff)
-#define CFG_CHANNEL_PREDICTION_FULL_SCAN_MS_DEFAULT   (60000)
-
-/*
- * Early stop scan is a feature for roaming to stop the scans at
- * an early stage as soon as we find a better AP to roam. This
- * would make the roaming happen quickly.
- */
-#define CFG_EARLY_STOP_SCAN_ENABLE           "gEnableEarlyStopScan"
-#define CFG_EARLY_STOP_SCAN_ENABLE_MIN       (0)
-#define CFG_EARLY_STOP_SCAN_ENABLE_MAX       (1)
-#define CFG_EARLY_STOP_SCAN_ENABLE_DEFAULT   (1)
-/*
- * Early stop scan minimum threshold is the minimum threshold
- * to be considered for stopping the scan. The algorithm starts
- * with a scan on the greedy channel list with the maximum threshold
- * and steps down the threshold by 20% for each further channel.
- * It can step down on each channel but cannot go lower than the minimum
- * threshold.
- */
-#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD           "gEarlyStopScanMinThreshold"
-#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_MIN       (-80)
-#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_MAX       (-70)
-#define CFG_EARLY_STOP_SCAN_MIN_THRESHOLD_DEFAULT   (-73)
-/*
- * Early stop scan maximum threshold is the maximum threshold
- * at which the candidate AP should be to be qualified as a
- * potential roam candidate and good enough to stop the roaming scan
- */
-#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD           "gEarlyStopScanMaxThreshold"
-#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_MIN       (-60)
-#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_MAX       (-40)
-#define CFG_EARLY_STOP_SCAN_MAX_THRESHOLD_DEFAULT   (-43)
-
-/*
- * This parameter will configure the first scan bucket
- * threshold to the mentioned value and all the AP's which
- * have RSSI under this threshold will fall under this
- * bucket.
- * This is a configuration item used to tweak and test the input
- * for internal algorithm. It should not be modified externally.
- */
-#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_NAME      "gFirstScanBucketThreshold"
-#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_MIN       (-50)
-#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_MAX       (-30)
-#define CFG_FIRST_SCAN_BUCKET_THRESHOLD_DEFAULT   (-30)
 
 /* Option to report rssi in cfg80211_inform_bss_frame()
  * 0 = use rssi value based on noise floor = -96 dBm
@@ -7203,28 +8028,6 @@ enum dot11p_mode {
 #define CFG_SET_TSF_GPIO_PIN_DEFAULT               (TSF_GPIO_PIN_INVALID)
 
 /*
- * OBSS scan parameters
- * obss_active_dwelltime - minimum per channel scan duration in active scan
- * obss_passive_dwelltime - minimum per channel scan duration in passive scan
- * obss_width_trigger_interval - During an OBSS scan operation, each channel
- *  in the set is scanned at least once per configured trigger interval time.
- */
-#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_NAME    "obss_active_dwelltime"
-#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MIN     (5)
-#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MAX     (1000)
-#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_DEFAULT (10)
-
-#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_NAME   "obss_passive_dwelltime"
-#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MIN    (10)
-#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MAX    (1000)
-#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_DEFAULT (20)
-
-#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_NAME "obss_width_trigger_interval"
-#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MIN  (10)
-#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MAX  (900)
-#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_DEFAULT (200)
-
-/*
  * Dense traffic threshold
  * traffic threshold required for dense roam scan
  * Measured in kbps
@@ -7235,14 +8038,6 @@ enum dot11p_mode {
 #define CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_DEFAULT (400)
 
 /*
- * Create bug report in case of nil scan results
- */
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN       "gbug_report_for_scan_results"
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_DISABLE    (0)
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_ENABLE     (1)
-#define CFG_CREATE_BUG_REPORT_FOR_SCAN_DEFAULT    (0)
-
-/*
  * Enabling gignore_peer_ht_opmode will enable 11g
  * protection only when there is a 11g AP in vicinity.
  */
@@ -7671,34 +8466,6 @@ enum dot11p_mode {
 #define CFG_ENABLE_DP_TRACE_DEFAULT	(1)
 
 /*
- * This parameter will globally disable/enable the adaptive dwell config.
- * Scan dwell time optimization
- * Following parameters will set different values of attributes for dwell
- * time optimization thus reducing total scan time.
- */
-
-/*
- * This parameter will globally disable/enable the adaptive dwell config.
- * Acceptable values for this:
- * 0: Config is disabled
- * 1: Config is enabled
- */
-#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_NAME      "adaptive_dwell_mode_enabled"
-#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_MIN       (0)
-#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_MAX       (1)
-#define CFG_ADAPTIVE_DWELL_MODE_ENABLED_DEFAULT   (1)
-
-/*
- * This parameter will set default adaptive mode, will be used if any of the
- * scan dwell mode is set to default.
- * For uses : see enum wmi_dwelltime_adaptive_mode
- */
-#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_NAME       "global_adapt_dwelltime_mode"
-#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_MIN        (0)
-#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_MAX        (4)
-#define CFG_GLOBAL_ADAPTIVE_DWELL_MODE_DEFAULT    (1)
-
-/*
  * This parameter will set the weight to calculate the average low pass
  * filter for channel congestion.
  * Acceptable values for this: 0-100 (In %)
@@ -7728,36 +8495,6 @@ enum dot11p_mode {
 #define CFG_ADAPT_DWELL_WIFI_THRESH_DEFAULT    (10)
 
 /*
- * This parameter will set the algo used in dwell time optimization during
- * host scan. see enum wmi_dwelltime_adaptive_mode.
- * Acceptable values for this:
- * 0: Default (Use firmware default mode)
- * 1: Conservative optimization
- * 2: Moderate optimization
- * 3: Aggressive optimization
- * 4: Static
- */
-#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     (0)
-
-/*
- * This parameter will set the algo used in dwell time optimization during
- * ext scan. see enum wmi_dwelltime_adaptive_mode.
- * Acceptable values for this:
- * 0: Default (Use firmware default mode)
- * 1: Conservative optimization
- * 2: Moderate optimization
- * 3: Aggressive optimization
- * 4: Static
- */
-#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_NAME     "extscan_adaptive_dwell_mode"
-#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_MIN      (0)
-#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_MAX      (4)
-#define CFG_ADAPTIVE_EXTSCAN_DWELL_MODE_DEFAULT  (0)
-
-/*
  * <ini>
  * g_bug_on_reinit_failure  - Enable/Disable bug on reinit
  * @Min: 0
@@ -7784,21 +8521,6 @@ enum dot11p_mode {
 #define CFG_BUG_ON_REINIT_FAILURE_DEFAULT  (1)
 
 /*
- * This parameter will set the algo used in dwell time optimization during
- * pno scan. see enum wmi_dwelltime_adaptive_mode.
- * Acceptable values for this:
- * 0: Default (Use firmware default mode)
- * 1: Conservative optimization
- * 2: Moderate optimization
- * 3: Aggressive optimization
- * 4: Static
- */
-#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_NAME     "pnoscan_adaptive_dwell_mode"
-#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_MIN      (0)
-#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_MAX      (4)
-#define CFG_ADAPTIVE_PNOSCAN_DWELL_MODE_DEFAULT  (0)
-
-/*
  * <ini>
  * gSub20ChannelWidth - Control sub 20 channel width (5/10 Mhz)
  * @Min: 0
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index db0f674ef41b..dfc81f7f1093 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -143,6 +143,24 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
  * </ioctl>
  */
 #define WE_SET_MAX_ASSOC     4
+/*
+ * <ioctl>
+ * scan_diable - Disable scan
+ *
+ * @INPUT: set_value
+ *
+ * @OUTPUT: None
+ *
+ * This IOCTL is used to set disable scan
+ *
+ * @E.g: iwpriv wlan0 scan_disable 1
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: Internal/External
+ *
+ * </ioctl>
+ */
 #define WE_SET_SCAN_DISABLE  5
 /*
  * <ioctl>
@@ -1959,6 +1977,24 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
 /* Sub ioctls 11 to 16 are not used */
 #define WE_GET_RECOVERY_STAT       17
 #define WE_GET_FW_PROFILE_DATA     18
+/*
+ * <ioctl>
+ * stop_obss_scan - Stop obss scan
+ *
+ * @INPUT: None
+ *
+ * @OUTPUT: None
+ *
+ * This IOCTL is used to stop obss scan
+ *
+ * @E.g: iwpriv wlan0 stop_obss_scan
+ *
+ * Supported Feature: Scan
+ *
+ * Usage: Internal/External
+ *
+ * </ioctl>
+ */
 #define WE_STOP_OBSS_SCAN          19
 
 /* Private ioctls and their sub-ioctls */