mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-18 10:42:19 -04:00
qcacld-3.0: Remove unused scan ini parameters
Remove unused scan result age count and scan result aging time ini parameters. Change-Id: Iae00c053429230706b9d0c9cb5ed8470a9b62812 CRs-Fixed: 2007156
This commit is contained in:
parent
3b23a9ed80
commit
ba13ea6c88
6 changed files with 0 additions and 176 deletions
|
|
@ -197,98 +197,6 @@ typedef enum {
|
|||
#define CFG_SCAN_RESULT_AGE_COUNT_MAX (100)
|
||||
#define CFG_SCAN_RESULT_AGE_COUNT_DEFAULT (1)
|
||||
|
||||
/*
|
||||
* <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)
|
||||
|
||||
/*
|
||||
* <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)
|
||||
|
||||
/*
|
||||
* <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)
|
||||
|
||||
/*
|
||||
* <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)
|
||||
#define CFG_SCAN_RESULT_AGE_TIME_CPS_DEFAULT (600)
|
||||
|
||||
/*
|
||||
* <ini>
|
||||
* gNeighborScanTimerPeriod - Set neighbor scan timer period
|
||||
|
|
@ -6938,10 +6846,6 @@ struct hdd_config {
|
|||
uint16_t TxRate;
|
||||
uint32_t ShortGI20MhzEnable;
|
||||
uint32_t ScanResultAgeCount;
|
||||
uint32_t nScanAgeTimeNCNPS;
|
||||
uint32_t nScanAgeTimeNCPS;
|
||||
uint32_t nScanAgeTimeCNPS;
|
||||
uint32_t nScanAgeTimeCPS;
|
||||
uint8_t nRssiCatGap;
|
||||
bool fIsShortPreamble;
|
||||
struct qdf_mac_addr IbssBssid;
|
||||
|
|
|
|||
|
|
@ -526,34 +526,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
|
|||
CFG_SCAN_RESULT_AGE_COUNT_MIN,
|
||||
CFG_SCAN_RESULT_AGE_COUNT_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_SCAN_RESULT_AGE_TIME_NCNPS_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, nScanAgeTimeNCNPS,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCNPS_DEFAULT,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCNPS_MIN,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCNPS_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_SCAN_RESULT_AGE_TIME_NCPS_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, nScanAgeTimeNCPS,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCPS_DEFAULT,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCPS_MIN,
|
||||
CFG_SCAN_RESULT_AGE_TIME_NCPS_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_SCAN_RESULT_AGE_TIME_CNPS_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, nScanAgeTimeCNPS,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CNPS_DEFAULT,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CNPS_MIN,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CNPS_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_SCAN_RESULT_AGE_TIME_CPS_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, nScanAgeTimeCPS,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CPS_DEFAULT,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CPS_MIN,
|
||||
CFG_SCAN_RESULT_AGE_TIME_CPS_MAX),
|
||||
|
||||
REG_VARIABLE(CFG_RSSI_CATEGORY_GAP_NAME, WLAN_PARAM_Integer,
|
||||
struct hdd_config, nRssiCatGap,
|
||||
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
|
||||
|
|
@ -6780,10 +6752,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
|
|||
}
|
||||
smeConfig->csrConfig.TxRate = pConfig->TxRate;
|
||||
smeConfig->csrConfig.nScanResultAgeCount = pConfig->ScanResultAgeCount;
|
||||
smeConfig->csrConfig.scanAgeTimeNCNPS = pConfig->nScanAgeTimeNCNPS;
|
||||
smeConfig->csrConfig.scanAgeTimeNCPS = pConfig->nScanAgeTimeNCPS;
|
||||
smeConfig->csrConfig.scanAgeTimeCNPS = pConfig->nScanAgeTimeCNPS;
|
||||
smeConfig->csrConfig.scanAgeTimeCPS = pConfig->nScanAgeTimeCPS;
|
||||
smeConfig->csrConfig.AdHocChannel24 = pConfig->OperatingChannel;
|
||||
smeConfig->csrConfig.fSupplicantCountryCodeHasPriority =
|
||||
pConfig->fSupplicantCountryCodeHasPriority;
|
||||
|
|
|
|||
|
|
@ -1120,14 +1120,6 @@ typedef struct tagCsrConfigParam {
|
|||
* before it is removed
|
||||
*/
|
||||
uint32_t nScanResultAgeCount;
|
||||
/* scan res aging time threshold when Not-Connect-No-PowerSave,in sec */
|
||||
uint32_t scanAgeTimeNCNPS;
|
||||
/* scan res aging time threshold when Not-Connect-Power-Save,in sec */
|
||||
uint32_t scanAgeTimeNCPS;
|
||||
/* scan res aging time threshold when Connect-No-Power-Save, in sec */
|
||||
uint32_t scanAgeTimeCNPS;
|
||||
/* scan res aging time threshold when Connect-Power-Save, in sec */
|
||||
uint32_t scanAgeTimeCPS;
|
||||
/* to set the RSSI difference for each category */
|
||||
uint8_t bCatRssiOffset;
|
||||
/* to set MCC Enable/Disable mode */
|
||||
|
|
|
|||
|
|
@ -489,14 +489,6 @@ typedef struct tagCsrConfig {
|
|||
uint8_t fAllowMCCGODiffBI;
|
||||
uint8_t AdHocChannel24;
|
||||
uint8_t AdHocChannel5G;
|
||||
/* scan res agingtime threshold when Not-Connect-No-Power-Save,in sec */
|
||||
uint32_t scanAgeTimeNCNPS;
|
||||
/* scan res aging time threshold when Not-Connect-Power-Save, in sec*/
|
||||
uint32_t scanAgeTimeNCPS;
|
||||
/* scan res aging time threshold when Connect-No-Power-Save, in sec*/
|
||||
uint32_t scanAgeTimeCNPS;
|
||||
/* scan res aging time threshold when Connect-Power-Savein sec */
|
||||
uint32_t scanAgeTimeCPS;
|
||||
/* each RSSI category has one value */
|
||||
uint32_t BssPreferValue[CSR_NUM_RSSI_CAT];
|
||||
int RSSICat[CSR_NUM_RSSI_CAT];
|
||||
|
|
|
|||
|
|
@ -1419,14 +1419,6 @@ static void init_config_param(tpAniSirGlobal pMac)
|
|||
pMac->roam.configParam.WMMSupportMode = eCsrRoamWmmAuto;
|
||||
pMac->roam.configParam.ProprietaryRatesEnabled = true;
|
||||
pMac->roam.configParam.TxRate = eCSR_TX_RATE_AUTO;
|
||||
pMac->roam.configParam.scanAgeTimeNCNPS =
|
||||
CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS;
|
||||
pMac->roam.configParam.scanAgeTimeNCPS =
|
||||
CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS;
|
||||
pMac->roam.configParam.scanAgeTimeCNPS =
|
||||
CSR_SCAN_AGING_TIME_CONNECT_NO_PS;
|
||||
pMac->roam.configParam.scanAgeTimeCPS =
|
||||
CSR_SCAN_AGING_TIME_CONNECT_W_PS;
|
||||
for (i = 0; i < CSR_NUM_RSSI_CAT; i++) {
|
||||
pMac->roam.configParam.BssPreferValue[i] = i;
|
||||
}
|
||||
|
|
@ -2282,22 +2274,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
|
|||
pMac->roam.configParam.agingCount =
|
||||
pParam->nScanResultAgeCount;
|
||||
}
|
||||
if (pParam->scanAgeTimeNCNPS) {
|
||||
pMac->roam.configParam.scanAgeTimeNCNPS =
|
||||
pParam->scanAgeTimeNCNPS;
|
||||
}
|
||||
if (pParam->scanAgeTimeNCPS) {
|
||||
pMac->roam.configParam.scanAgeTimeNCPS =
|
||||
pParam->scanAgeTimeNCPS;
|
||||
}
|
||||
if (pParam->scanAgeTimeCNPS) {
|
||||
pMac->roam.configParam.scanAgeTimeCNPS =
|
||||
pParam->scanAgeTimeCNPS;
|
||||
}
|
||||
if (pParam->scanAgeTimeCPS) {
|
||||
pMac->roam.configParam.scanAgeTimeCPS =
|
||||
pParam->scanAgeTimeCPS;
|
||||
}
|
||||
if (pParam->obss_width_interval) {
|
||||
pMac->roam.configParam.obss_width_interval =
|
||||
pParam->obss_width_interval;
|
||||
|
|
@ -2639,10 +2615,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
|
|||
#endif
|
||||
pParam->eBand = cfg_params->eBand;
|
||||
pParam->nScanResultAgeCount = cfg_params->agingCount;
|
||||
pParam->scanAgeTimeNCNPS = cfg_params->scanAgeTimeNCNPS;
|
||||
pParam->scanAgeTimeNCPS = cfg_params->scanAgeTimeNCPS;
|
||||
pParam->scanAgeTimeCNPS = cfg_params->scanAgeTimeCNPS;
|
||||
pParam->scanAgeTimeCPS = cfg_params->scanAgeTimeCPS;
|
||||
pParam->bCatRssiOffset = cfg_params->bCatRssiOffset;
|
||||
pParam->fSupplicantCountryCodeHasPriority =
|
||||
cfg_params->fSupplicantCountryCodeHasPriority;
|
||||
|
|
|
|||
|
|
@ -76,10 +76,6 @@
|
|||
#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT (60 * QDF_MC_TIMER_TO_SEC_UNIT) /* 60 seconds */
|
||||
|
||||
/* the following defines are NOT used by palTimer */
|
||||
#define CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS 50 /* 50 seconds */
|
||||
#define CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS 300 /* 300 seconds */
|
||||
#define CSR_SCAN_AGING_TIME_CONNECT_NO_PS 150 /* 150 seconds */
|
||||
#define CSR_SCAN_AGING_TIME_CONNECT_W_PS 600 /* 600 seconds */
|
||||
#define CSR_JOIN_FAILURE_TIMEOUT_DEFAULT (3000)
|
||||
#define CSR_JOIN_FAILURE_TIMEOUT_MIN (1000) /* minimal value */
|
||||
/* These are going against the signed RSSI (int8_t) so it is between -+127 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue