A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Cleanup scan concurrent active and passive min time

Browse source 
Cleanup Scan active and passive concurrent time CFG/INI
references from legacy code.

Concurrent active and passive min time component is never used,
so remove it.

Change-Id: Idca5285d58bea659a1a481c1f33827608377ab98
CRs-Fixed: 2363138
This commit is contained in:
Harprit Chhabada 2018-12-06 17:35:49 -08:00 • committed by nshrivas
commit 88c4e42509
6 changed files with 0 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_cfg.h
View file

@ -3602,9 +3602,7 @@ struct hdd_config {
uint32_t nInitialDwellTime; /* in units of milliseconds */
bool initial_scan_no_dfs_chnl;
uint32_t nPassiveMinChnTimeConc; /* in units of milliseconds */
uint32_t nPassiveMaxChnTimeConc; /* in units of milliseconds */
uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */
uint32_t nActiveMaxChnTimeConc; /* in units of milliseconds */
uint32_t nRestTimeConc; /* in units of milliseconds */
/* In units of milliseconds */

18
core/hdd/src/wlan_hdd_cfg.c
View file

@ -189,13 +189,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MIN,
CFG_PASSIVE_MAX_CHANNEL_TIME_CONC_MAX),
REG_VARIABLE(CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
struct hdd_config, nPassiveMinChnTimeConc,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_DEFAULT,
CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MIN,
CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MAX),
REG_VARIABLE(CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
struct hdd_config, nActiveMaxChnTimeConc,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@ -203,13 +196,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MIN,
CFG_ACTIVE_MAX_CHANNEL_TIME_CONC_MAX),
REG_VARIABLE(CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_NAME, WLAN_PARAM_Integer,
struct hdd_config, nActiveMinChnTimeConc,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_DEFAULT,
CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MIN,
CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MAX),
REG_VARIABLE(CFG_REST_TIME_CONC_NAME, WLAN_PARAM_Integer,
struct hdd_config, nRestTimeConc,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@ -2583,12 +2569,8 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
smeConfig->csrConfig.nPassiveMaxChnTime = pConfig->nPassiveMaxChnTime;
smeConfig->csrConfig.nActiveMaxChnTimeConc =
pConfig->nActiveMaxChnTimeConc;
smeConfig->csrConfig.nActiveMinChnTimeConc =
pConfig->nActiveMinChnTimeConc;
smeConfig->csrConfig.nPassiveMaxChnTimeConc =
pConfig->nPassiveMaxChnTimeConc;
smeConfig->csrConfig.nPassiveMinChnTimeConc =
pConfig->nPassiveMinChnTimeConc;
smeConfig->csrConfig.nRestTimeConc = pConfig->nRestTimeConc;
smeConfig->csrConfig.min_rest_time_conc = pConfig->min_rest_time_conc;
smeConfig->csrConfig.idle_time_conc = pConfig->idle_time_conc;

38
core/hdd/src/wlan_hdd_ioctl.c
View file

@ -2291,25 +2291,6 @@ static int hdd_conc_set_dwell_time(hdd_context_t *hdd_ctx, uint8_t *command)
p_cfg->nActiveMaxChnTimeConc = val;
sme_config->csrConfig.nActiveMaxChnTimeConc = val;
sme_update_config(mac_handle, sme_config);
} else if (strncmp(command, "CONCSETDWELLTIME ACTIVE MIN", 27) == 0) {
if (drv_cmd_validate(command, 27)) {
hdd_err("Invalid driver command");
retval = -EINVAL;
goto sme_config_free;
}
value = value + 28;
temp = kstrtou32(value, 10, &val);
if (temp != 0 || val < CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MIN ||
val > CFG_ACTIVE_MIN_CHANNEL_TIME_CONC_MAX) {
hdd_err("argument passed for CONCSETDWELLTIME ACTIVE MIN is incorrect");
retval = -EFAULT;
goto sme_config_free;
}
p_cfg->nActiveMinChnTimeConc = val;
sme_config->csrConfig.nActiveMinChnTimeConc = val;
sme_update_config(mac_handle, sme_config);
} else if (strncmp(command, "CONCSETDWELLTIME PASSIVE MAX", 28) == 0) {
if (drv_cmd_validate(command, 28)) {
hdd_err("Invalid driver command");
@ -2329,25 +2310,6 @@ static int hdd_conc_set_dwell_time(hdd_context_t *hdd_ctx, uint8_t *command)
p_cfg->nPassiveMaxChnTimeConc = val;
sme_config->csrConfig.nPassiveMaxChnTimeConc = val;
sme_update_config(mac_handle, sme_config);
} else if (strncmp(command, "CONCSETDWELLTIME PASSIVE MIN", 28) == 0) {
if (drv_cmd_validate(command, 28)) {
hdd_err("Invalid driver command");
retval = -EINVAL;
goto sme_config_free;
}
value = value + 29;
temp = kstrtou32(value, 10, &val);
if (temp != 0 || val < CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MIN ||
val > CFG_PASSIVE_MIN_CHANNEL_TIME_CONC_MAX) {
hdd_err("argument passed for SETDWELLTIME PASSIVE MIN is incorrect");
retval = -EFAULT;
goto sme_config_free;
}
p_cfg->nPassiveMinChnTimeConc = val;
sme_config->csrConfig.nPassiveMinChnTimeConc = val;
sme_update_config(mac_handle, sme_config);
} else {
retval = -EINVAL;
}

2
core/sme/inc/csr_api.h
View file

@ -1039,9 +1039,7 @@ typedef struct tagCsrConfigParam {
uint32_t nActiveMaxChnTime; /* in units of milliseconds */
uint32_t nInitialDwellTime; /* in units of milliseconds */
bool initial_scan_no_dfs_chnl;
uint32_t nPassiveMinChnTimeConc; /* in units of milliseconds */
uint32_t nPassiveMaxChnTimeConc; /* in units of milliseconds */
uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */
uint32_t nActiveMaxChnTimeConc; /* in units of milliseconds */
uint32_t nRestTimeConc; /* in units of milliseconds */
/*In units of milliseconds*/

2
core/sme/inc/csr_internal.h
View file

@ -400,9 +400,7 @@ struct csr_config {
uint32_t nInitialDwellTime; /* in units of milliseconds */
bool initial_scan_no_dfs_chnl;
uint32_t nPassiveMinChnTimeConc;/* in units of milliseconds */
uint32_t nPassiveMaxChnTimeConc;/* in units of milliseconds */
uint32_t nActiveMinChnTimeConc; /* in units of milliseconds */
uint32_t nActiveMaxChnTimeConc; /* in units of milliseconds */
uint32_t nRestTimeConc; /* in units of milliseconds */
/* In units of milliseconds */

14
core/sme/src/csr/csr_api_roam.c
View file

@ -1674,12 +1674,8 @@ static void init_config_param(struct mac_context *mac)
CSR_PASSIVE_MAX_CHANNEL_TIME;
mac->roam.configParam.nActiveMaxChnTimeConc =
CSR_ACTIVE_MAX_CHANNEL_TIME_CONC;
mac->roam.configParam.nActiveMinChnTimeConc =
CSR_ACTIVE_MIN_CHANNEL_TIME_CONC;
mac->roam.configParam.nPassiveMaxChnTimeConc =
CSR_PASSIVE_MAX_CHANNEL_TIME_CONC;
mac->roam.configParam.nPassiveMinChnTimeConc =
CSR_PASSIVE_MIN_CHANNEL_TIME_CONC;
mac->roam.configParam.nRestTimeConc = CSR_REST_TIME_CONC;
mac->roam.configParam.min_rest_time_conc = CSR_MIN_REST_TIME_CONC;
mac->roam.configParam.idle_time_conc = CSR_IDLE_TIME_CONC;
@ -2552,18 +2548,10 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
mac->roam.configParam.nActiveMaxChnTimeConc =
pParam->nActiveMaxChnTimeConc;
}
if (pParam->nActiveMinChnTimeConc) {
mac->roam.configParam.nActiveMinChnTimeConc =
pParam->nActiveMinChnTimeConc;
}
if (pParam->nPassiveMaxChnTimeConc) {
mac->roam.configParam.nPassiveMaxChnTimeConc =
pParam->nPassiveMaxChnTimeConc;
}
if (pParam->nPassiveMinChnTimeConc) {
mac->roam.configParam.nPassiveMinChnTimeConc =
pParam->nPassiveMinChnTimeConc;
}
mac->roam.configParam.nRestTimeConc = pParam->nRestTimeConc;
mac->roam.configParam.min_rest_time_conc =
pParam->min_rest_time_conc;
@ -2790,9 +2778,7 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
pParam->nActiveMaxChnTime = cfg_params->nActiveMaxChnTime;
pParam->nPassiveMaxChnTime = cfg_params->nPassiveMaxChnTime;
pParam->nActiveMaxChnTimeConc = cfg_params->nActiveMaxChnTimeConc;
pParam->nActiveMinChnTimeConc = cfg_params->nActiveMinChnTimeConc;
pParam->nPassiveMaxChnTimeConc = cfg_params->nPassiveMaxChnTimeConc;
pParam->nPassiveMinChnTimeConc = cfg_params->nPassiveMinChnTimeConc;
pParam->nRestTimeConc = cfg_params->nRestTimeConc;
pParam->min_rest_time_conc = cfg_params->min_rest_time_conc;
pParam->idle_time_conc = cfg_params->idle_time_conc;