diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index a6677ebb8277..1f669b9fb6a2 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -814,29 +814,6 @@ enum hdd_dot11_mode {
#define CFG_PASSIVE_MAX_CHANNEL_TIME_MAX (10000)
#define CFG_PASSIVE_MAX_CHANNEL_TIME_DEFAULT (110)
-/*
- *
- * 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
- *
- *
- */
-#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)
-
/*
*
* gActiveMaxChannelTime - Set max channel time for active scan
@@ -14343,8 +14320,6 @@ struct hdd_config {
/* Additional Handoff params */
uint16_t nVccRssiTrigger;
uint32_t nVccUlMacLossThreshold;
-
- uint32_t nPassiveMinChnTime; /* in units of milliseconds */
uint32_t nPassiveMaxChnTime; /* in units of milliseconds */
uint32_t nActiveMaxChnTime; /* in units of milliseconds */
uint32_t scan_probe_repeat_time;
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index f801fa0205b9..8191823ec7e2 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -700,13 +700,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_PASSIVE_MAX_CHANNEL_TIME_MIN,
CFG_PASSIVE_MAX_CHANNEL_TIME_MAX),
- REG_VARIABLE(CFG_PASSIVE_MIN_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
- struct hdd_config, nPassiveMinChnTime,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_PASSIVE_MIN_CHANNEL_TIME_DEFAULT,
- CFG_PASSIVE_MIN_CHANNEL_TIME_MIN,
- CFG_PASSIVE_MIN_CHANNEL_TIME_MAX),
-
REG_VARIABLE(CFG_ACTIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer,
struct hdd_config, nActiveMaxChnTime,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -8123,14 +8116,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_SHORT_PREAMBLE to CFG");
}
- if (sme_cfg_set_int(mac_handle,
- WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME,
- config->nPassiveMinChnTime)
- == QDF_STATUS_E_FAILURE) {
- status = false;
- hdd_err("Couldn't pass on WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME to CFG");
- }
-
if (sme_cfg_set_int(mac_handle,
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
config->nPassiveMaxChnTime)
@@ -8710,7 +8695,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
pConfig->initial_scan_no_dfs_chnl;
smeConfig->csrConfig.nActiveMaxChnTime = pConfig->nActiveMaxChnTime;
smeConfig->csrConfig.nPassiveMaxChnTime = pConfig->nPassiveMaxChnTime;
- smeConfig->csrConfig.nPassiveMinChnTime = pConfig->nPassiveMinChnTime;
smeConfig->csrConfig.nActiveMaxChnTimeConc =
pConfig->nActiveMaxChnTimeConc;
smeConfig->csrConfig.nActiveMinChnTimeConc =
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 78d50f160a3a..4357d623a47a 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -2225,11 +2225,6 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command,
(int)pCfg->nPassiveMaxChnTime);
return 0;
}
- if (strncmp(command, "GETDWELLTIME PASSIVE MIN", 24) == 0) {
- *len = scnprintf(extra, n, "GETDWELLTIME PASSIVE MIN %u\n",
- (int)pCfg->nPassiveMinChnTime);
- return 0;
- }
if (strncmp(command, "GETDWELLTIME", 12) == 0) {
*len = scnprintf(extra, n, "GETDWELLTIME %u\n",
(int)pCfg->nActiveMaxChnTime);
@@ -2292,21 +2287,6 @@ static int hdd_set_dwell_time(struct hdd_adapter *adapter, uint8_t *command)
pCfg->nPassiveMaxChnTime = val;
sme_config->csrConfig.nPassiveMaxChnTime = val;
sme_update_config(mac_handle, sme_config);
- } else if (strncmp(command, "SETDWELLTIME PASSIVE MIN", 24) == 0) {
- if (drv_cmd_validate(command, 24))
- return -EINVAL;
-
- value = value + 25;
- temp = kstrtou32(value, 10, &val);
- if (temp != 0 || val < CFG_PASSIVE_MIN_CHANNEL_TIME_MIN ||
- val > CFG_PASSIVE_MIN_CHANNEL_TIME_MAX) {
- hdd_err("argument passed for SETDWELLTIME PASSIVE MIN is incorrect");
- retval = -EFAULT;
- goto free;
- }
- pCfg->nPassiveMinChnTime = val;
- sme_config->csrConfig.nPassiveMinChnTime = val;
- sme_update_config(mac_handle, sme_config);
} else if (strncmp(command, "SETDWELLTIME", 12) == 0) {
if (drv_cmd_validate(command, 12))
return -EINVAL;
diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index 548da3ee562b..1e44ebc816c6 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -38,7 +38,6 @@ enum {
WNI_CFG_RTS_THRESHOLD,
WNI_CFG_FRAGMENTATION_THRESHOLD,
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
- WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME,
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
WNI_CFG_JOIN_FAILURE_TIMEOUT,
WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
diff --git a/core/mac/src/cfg/cfgUtil/cfg.txt b/core/mac/src/cfg/cfgUtil/cfg.txt
index e61db1067c1b..91f0769135f7 100644
--- a/core/mac/src/cfg/cfgUtil/cfg.txt
+++ b/core/mac/src/cfg/cfgUtil/cfg.txt
@@ -329,17 +329,6 @@ NONE
V RW NP
NONE
0 65535 40
-*
-* Minimum Channel Time (TU)
-*
-
-WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME I 4 9
-V RW NP
-NONE
-0 65535 60
-V RW NP
-NONE
-0 65535 60
*
* Maximum Channel Time (TU)
diff --git a/core/mac/src/cfg/cfg_param_name.c b/core/mac/src/cfg/cfg_param_name.c
index a4d8173108da..4b9cb295b2a4 100644
--- a/core/mac/src/cfg/cfg_param_name.c
+++ b/core/mac/src/cfg/cfg_param_name.c
@@ -53,7 +53,6 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_RTS_THRESHOLD);
CASE_RETURN_STRING(WNI_CFG_FRAGMENTATION_THRESHOLD);
CASE_RETURN_STRING(WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME);
- CASE_RETURN_STRING(WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME);
CASE_RETURN_STRING(WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME);
CASE_RETURN_STRING(WNI_CFG_JOIN_FAILURE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT);
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index b973709e1e29..3e10c8b38bb1 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -88,11 +88,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMIN,
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMAX,
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STADEF},
- {WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME_STAMIN,
- WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME_STAMAX,
- WNI_CFG_PASSIVE_MINIMUM_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,
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 7c1524cac8ce..eeb238fb5289 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1110,7 +1110,6 @@ typedef struct tagCsrConfigParam {
bool fSupplicantCountryCodeHasPriority;
uint16_t vccRssiThreshold;
uint32_t vccUlMacLossThreshold;
- uint32_t nPassiveMinChnTime; /* in units of milliseconds */
uint32_t nPassiveMaxChnTime; /* in units of milliseconds */
uint32_t nActiveMaxChnTime; /* in units of milliseconds */
uint32_t nInitialDwellTime; /* in units of milliseconds */
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index 47199df6d44b..fb8a8b00f331 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -450,8 +450,6 @@ struct csr_config {
uint16_t vccRssiThreshold;
uint32_t vccUlMacLossThreshold;
-
- uint32_t nPassiveMinChnTime; /* in units of milliseconds */
uint32_t nPassiveMaxChnTime; /* in units of milliseconds */
uint32_t nActiveMaxChnTime; /* in units of milliseconds */
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 21bbd4bf8945..11f236a3ce84 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1637,8 +1637,6 @@ static void init_config_param(tpAniSirGlobal pMac)
pMac->roam.configParam.nActiveMaxChnTime = CSR_ACTIVE_MAX_CHANNEL_TIME;
pMac->roam.configParam.nPassiveMaxChnTime =
CSR_PASSIVE_MAX_CHANNEL_TIME;
- pMac->roam.configParam.nPassiveMinChnTime =
- CSR_PASSIVE_MIN_CHANNEL_TIME;
pMac->roam.configParam.nActiveMaxChnTimeConc =
CSR_ACTIVE_MAX_CHANNEL_TIME_CONC;
pMac->roam.configParam.nActiveMinChnTimeConc =
@@ -2784,12 +2782,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
cfg_set_int(pMac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
pParam->nPassiveMaxChnTime);
}
- if (pParam->nPassiveMinChnTime) {
- pMac->roam.configParam.nPassiveMinChnTime =
- pParam->nPassiveMinChnTime;
- cfg_set_int(pMac, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME,
- pParam->nPassiveMinChnTime);
- }
if (pParam->nActiveMaxChnTimeConc) {
pMac->roam.configParam.nActiveMaxChnTimeConc =
pParam->nActiveMaxChnTimeConc;
@@ -3303,7 +3295,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
pParam->bandCapability = cfg_params->bandCapability;
pParam->nActiveMaxChnTime = cfg_params->nActiveMaxChnTime;
pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime;
- pParam->nPassiveMinChnTime = cfg_params->nPassiveMinChnTime;
pParam->nActiveMaxChnTimeConc = cfg_params->nActiveMaxChnTimeConc;
pParam->nActiveMinChnTimeConc = cfg_params->nActiveMinChnTimeConc;
pParam->nPassiveMaxChnTimeConc = cfg_params->nPassiveMaxChnTimeConc;
diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h
index 6f70518ab6b9..e294f007e39b 100644
--- a/core/sme/src/csr/csr_inside_api.h
+++ b/core/sme/src/csr/csr_inside_api.h
@@ -30,8 +30,6 @@
#include "wlan_objmgr_vdev_obj.h"
#define CSR_PASSIVE_MAX_CHANNEL_TIME 110
-#define CSR_PASSIVE_MIN_CHANNEL_TIME 60
-
#define CSR_ACTIVE_MAX_CHANNEL_TIME 40
#define CSR_PASSIVE_MAX_CHANNEL_TIME_CONC 110
#define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC 60