diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index b6e2dac391e8..a6677ebb8277 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -860,29 +860,6 @@ enum hdd_dot11_mode { #define CFG_ACTIVE_MAX_CHANNEL_TIME_MAX (10000) #define CFG_ACTIVE_MAX_CHANNEL_TIME_DEFAULT (40) -/* - * - * 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 - * - * - */ -#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) - /* * * gScanNumProbes - Set the number of probes on each channel for active scan @@ -14369,7 +14346,6 @@ struct hdd_config { uint32_t nPassiveMinChnTime; /* in units of milliseconds */ uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ - uint32_t nActiveMinChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t scan_probe_repeat_time; uint32_t scan_num_probes; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 51c4d57983f2..f801fa0205b9 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -714,13 +714,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ACTIVE_MAX_CHANNEL_TIME_MIN, CFG_ACTIVE_MAX_CHANNEL_TIME_MAX), - REG_VARIABLE(CFG_ACTIVE_MIN_CHANNEL_TIME_NAME, WLAN_PARAM_Integer, - struct hdd_config, nActiveMinChnTime, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ACTIVE_MIN_CHANNEL_TIME_DEFAULT, - CFG_ACTIVE_MIN_CHANNEL_TIME_MIN, - CFG_ACTIVE_MIN_CHANNEL_TIME_MAX), - REG_VARIABLE(CFG_SCAN_NUM_PROBES_NAME, WLAN_PARAM_Integer, struct hdd_config, scan_num_probes, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -8716,7 +8709,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.initial_scan_no_dfs_chnl = pConfig->initial_scan_no_dfs_chnl; smeConfig->csrConfig.nActiveMaxChnTime = pConfig->nActiveMaxChnTime; - smeConfig->csrConfig.nActiveMinChnTime = pConfig->nActiveMinChnTime; smeConfig->csrConfig.nPassiveMaxChnTime = pConfig->nPassiveMaxChnTime; smeConfig->csrConfig.nPassiveMinChnTime = pConfig->nPassiveMinChnTime; smeConfig->csrConfig.nActiveMaxChnTimeConc = diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 7e0764c0e245..78d50f160a3a 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -2220,11 +2220,6 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command, (int)pCfg->nActiveMaxChnTime); return 0; } - if (strncmp(command, "GETDWELLTIME ACTIVE MIN", 23) == 0) { - *len = scnprintf(extra, n, "GETDWELLTIME ACTIVE MIN %u\n", - (int)pCfg->nActiveMinChnTime); - return 0; - } if (strncmp(command, "GETDWELLTIME PASSIVE MAX", 24) == 0) { *len = scnprintf(extra, n, "GETDWELLTIME PASSIVE MAX %u\n", (int)pCfg->nPassiveMaxChnTime); @@ -2282,21 +2277,6 @@ static int hdd_set_dwell_time(struct hdd_adapter *adapter, uint8_t *command) pCfg->nActiveMaxChnTime = val; sme_config->csrConfig.nActiveMaxChnTime = val; sme_update_config(mac_handle, sme_config); - } else if (strncmp(command, "SETDWELLTIME ACTIVE MIN", 23) == 0) { - if (drv_cmd_validate(command, 23)) - return -EINVAL; - - value = value + 24; - temp = kstrtou32(value, 10, &val); - if (temp != 0 || val < CFG_ACTIVE_MIN_CHANNEL_TIME_MIN || - val > CFG_ACTIVE_MIN_CHANNEL_TIME_MAX) { - hdd_err("argument passed for SETDWELLTIME ACTIVE MIN is incorrect"); - retval = -EFAULT; - goto free; - } - pCfg->nActiveMinChnTime = val; - sme_config->csrConfig.nActiveMinChnTime = val; - sme_update_config(mac_handle, sme_config); } else if (strncmp(command, "SETDWELLTIME PASSIVE MAX", 24) == 0) { if (drv_cmd_validate(command, 24)) return -EINVAL; diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h index 4e187e5cc54b..548da3ee562b 100644 --- a/core/mac/inc/wni_cfg.h +++ b/core/mac/inc/wni_cfg.h @@ -37,7 +37,6 @@ enum { WNI_CFG_WEP_DEFAULT_KEYID, WNI_CFG_RTS_THRESHOLD, WNI_CFG_FRAGMENTATION_THRESHOLD, - WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, @@ -426,10 +425,6 @@ enum { #define WNI_CFG_FRAGMENTATION_THRESHOLD_STAMAX 8000 #define WNI_CFG_FRAGMENTATION_THRESHOLD_STADEF 8000 -#define WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STAMIN 0 -#define WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STAMAX 65535 -#define WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STADEF 20 - #define WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMIN 0 #define WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STAMAX 65535 #define WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME_STADEF 40 diff --git a/core/mac/src/cfg/cfgUtil/cfg.txt b/core/mac/src/cfg/cfgUtil/cfg.txt index 62119d71c458..e61db1067c1b 100644 --- a/core/mac/src/cfg/cfgUtil/cfg.txt +++ b/core/mac/src/cfg/cfgUtil/cfg.txt @@ -318,19 +318,6 @@ V RW NP HAL 256 8000 8000 - -* -* Minimum Channel Time (TU) -* - -WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME I 4 9 -V RW NP -NONE -0 65535 20 -V RW NP -NONE -0 65535 20 - * * 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 773e3c795ec7..a4d8173108da 100644 --- a/core/mac/src/cfg/cfg_param_name.c +++ b/core/mac/src/cfg/cfg_param_name.c @@ -52,7 +52,6 @@ const char *cfg_get_string(uint16_t cfg_id) CASE_RETURN_STRING(WNI_CFG_WEP_DEFAULT_KEYID); CASE_RETURN_STRING(WNI_CFG_RTS_THRESHOLD); CASE_RETURN_STRING(WNI_CFG_FRAGMENTATION_THRESHOLD); - CASE_RETURN_STRING(WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME); 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); diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index 29859ce86c9b..b973709e1e29 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.c @@ -83,11 +83,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = { WNI_CFG_FRAGMENTATION_THRESHOLD_STAMIN, WNI_CFG_FRAGMENTATION_THRESHOLD_STAMAX, WNI_CFG_FRAGMENTATION_THRESHOLD_STADEF}, - {WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, - CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT, - WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STAMIN, - WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STAMAX, - WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME_STADEF}, {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, diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index b74e90fd9d9e..7c1524cac8ce 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1112,7 +1112,6 @@ typedef struct tagCsrConfigParam { uint32_t vccUlMacLossThreshold; uint32_t nPassiveMinChnTime; /* in units of milliseconds */ uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ - uint32_t nActiveMinChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t nInitialDwellTime; /* in units of milliseconds */ bool initial_scan_no_dfs_chnl; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 66abb711efd6..47199df6d44b 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -453,7 +453,6 @@ struct csr_config { uint32_t nPassiveMinChnTime; /* in units of milliseconds */ uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ - uint32_t nActiveMinChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t nInitialDwellTime; /* 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 bf937e2c07b6..21bbd4bf8945 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1635,7 +1635,6 @@ static void init_config_param(tpAniSirGlobal pMac) CSR_DEFAULT_RSSI_DB_GAP); pMac->roam.configParam.fSupplicantCountryCodeHasPriority = false; pMac->roam.configParam.nActiveMaxChnTime = CSR_ACTIVE_MAX_CHANNEL_TIME; - pMac->roam.configParam.nActiveMinChnTime = CSR_ACTIVE_MIN_CHANNEL_TIME; pMac->roam.configParam.nPassiveMaxChnTime = CSR_PASSIVE_MAX_CHANNEL_TIME; pMac->roam.configParam.nPassiveMinChnTime = @@ -2779,12 +2778,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, cfg_set_int(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME, pParam->nActiveMaxChnTime); } - if (pParam->nActiveMinChnTime) { - pMac->roam.configParam.nActiveMinChnTime = - pParam->nActiveMinChnTime; - cfg_set_int(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, - pParam->nActiveMinChnTime); - } if (pParam->nPassiveMaxChnTime) { pMac->roam.configParam.nPassiveMaxChnTime = pParam->nPassiveMaxChnTime; @@ -3309,7 +3302,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->AdHocChannel5G = cfg_params->AdHocChannel5G; pParam->bandCapability = cfg_params->bandCapability; pParam->nActiveMaxChnTime = cfg_params->nActiveMaxChnTime; - pParam->nActiveMinChnTime = cfg_params->nActiveMinChnTime; pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime; pParam->nPassiveMinChnTime = cfg_params->nPassiveMinChnTime; pParam->nActiveMaxChnTimeConc = cfg_params->nActiveMaxChnTimeConc; diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 081b50be1a5b..6f70518ab6b9 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -33,8 +33,6 @@ #define CSR_PASSIVE_MIN_CHANNEL_TIME 60 #define CSR_ACTIVE_MAX_CHANNEL_TIME 40 -#define CSR_ACTIVE_MIN_CHANNEL_TIME 20 - #define CSR_PASSIVE_MAX_CHANNEL_TIME_CONC 110 #define CSR_PASSIVE_MIN_CHANNEL_TIME_CONC 60