From 3daaeeb4ea1b3b6f5f214fa69a3a921086efdb63 Mon Sep 17 00:00:00 2001 From: wadesong Date: Thu, 15 Nov 2018 17:47:32 +0800 Subject: [PATCH] qcacld-3.0: CFG INI refining - wave 3 Remove the definitions and related internal data structures and value retrieving code of the following 3 CFG INI items, due to they're not used to control any driver behavior any more. -gVccRssiTrigger -gVccUlMacLossThresh -gEnableBypass11d Change-Id: I919bf191f48db4bf0947235ff804aed2b4b1bdb9 CRs-Fixed: 2352224 --- core/hdd/inc/wlan_hdd_cfg.h | 18 ------------------ core/hdd/src/wlan_hdd_cfg.c | 25 ------------------------- core/sme/inc/csr_api.h | 9 --------- core/sme/inc/csr_internal.h | 9 --------- core/sme/src/csr/csr_api_roam.c | 22 ---------------------- 5 files changed, 83 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index e0f60c0361f6..5bd139eb1b13 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2433,16 +2433,6 @@ enum hdd_dot11_mode { #define CFG_DISABLE_PACKET_FILTER_MAX (1) #define CFG_DISABLE_PACKET_FILTER_DEFAULT (1) -#define CFG_VCC_RSSI_TRIGGER_NAME "gVccRssiTrigger" -#define CFG_VCC_RSSI_TRIGGER_MIN (0) -#define CFG_VCC_RSSI_TRIGGER_MAX (80) -#define CFG_VCC_RSSI_TRIGGER_DEFAULT (80) - -#define CFG_VCC_UL_MAC_LOSS_THRESH_NAME "gVccUlMacLossThresh" -#define CFG_VCC_UL_MAC_LOSS_THRESH_MIN (0) -#define CFG_VCC_UL_MAC_LOSS_THRESH_MAX (9) -#define CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT (9) - /* * * gPassiveMaxChannelTimeConc - Maximum passive scan time in milliseconds. @@ -3191,11 +3181,6 @@ enum station_keepalive_method { #define CFG_HW_FILTER_MODE_BITMAP_MAX (3) #define CFG_HW_FILTER_MODE_BITMAP_DEFAULT (1) -#define CFG_ENABLE_BYPASS_11D_NAME "gEnableBypass11d" -#define CFG_ENABLE_BYPASS_11D_MIN (0) -#define CFG_ENABLE_BYPASS_11D_MAX (1) -#define CFG_ENABLE_BYPASS_11D_DEFAULT (1) - /* * gEnableDFSChnlScan - enable dfs channel scan. * @Min: 0 @@ -6691,8 +6676,6 @@ struct hdd_config { int32_t nhi_rssi_scan_rssi_ub; /* Additional Handoff params */ - uint16_t nVccRssiTrigger; - uint32_t nVccUlMacLossThreshold; uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t scan_probe_repeat_time; @@ -6776,7 +6759,6 @@ struct hdd_config { #ifdef ENABLE_MTRACE_LOG bool enable_mtrace; #endif - uint8_t enableBypass11d; uint8_t enableDFSChnlScan; uint8_t enable_dfs_pno_chnl_scan; uint8_t ShortGI40MhzEnable; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 09bf96a1b06f..9714a9729288 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -577,20 +577,6 @@ struct reg_table_entry g_registry_table[] = { CFG_DISABLE_PACKET_FILTER_MIN, CFG_DISABLE_PACKET_FILTER_MAX), - REG_VARIABLE(CFG_VCC_RSSI_TRIGGER_NAME, WLAN_PARAM_Integer, - struct hdd_config, nVccRssiTrigger, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_VCC_RSSI_TRIGGER_DEFAULT, - CFG_VCC_RSSI_TRIGGER_MIN, - CFG_VCC_RSSI_TRIGGER_MAX), - - REG_VARIABLE(CFG_VCC_UL_MAC_LOSS_THRESH_NAME, WLAN_PARAM_Integer, - struct hdd_config, nVccUlMacLossThreshold, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_VCC_UL_MAC_LOSS_THRESH_DEFAULT, - CFG_VCC_UL_MAC_LOSS_THRESH_MIN, - CFG_VCC_UL_MAC_LOSS_THRESH_MAX), - REG_VARIABLE(CFG_PASSIVE_MAX_CHANNEL_TIME_NAME, WLAN_PARAM_Integer, struct hdd_config, nPassiveMaxChnTime, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1220,13 +1206,6 @@ struct reg_table_entry g_registry_table[] = { CFG_ENABLE_MTRACE_MAX), #endif - REG_VARIABLE(CFG_ENABLE_BYPASS_11D_NAME, WLAN_PARAM_Integer, - struct hdd_config, enableBypass11d, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_BYPASS_11D_DEFAULT, - CFG_ENABLE_BYPASS_11D_MIN, - CFG_ENABLE_BYPASS_11D_MAX), - REG_VARIABLE(CFG_ENABLE_DFS_CHNL_SCAN_NAME, WLAN_PARAM_Integer, struct hdd_config, enableDFSChnlScan, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -3966,9 +3945,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.nScanResultAgeCount = pConfig->ScanResultAgeCount; smeConfig->csrConfig.AdHocChannel24 = pConfig->OperatingChannel; smeConfig->csrConfig.bCatRssiOffset = pConfig->nRssiCatGap; - smeConfig->csrConfig.vccRssiThreshold = pConfig->nVccRssiTrigger; - smeConfig->csrConfig.vccUlMacLossThreshold = - pConfig->nVccUlMacLossThreshold; smeConfig->csrConfig.nInitialDwellTime = pConfig->nInitialDwellTime; smeConfig->csrConfig.initial_scan_no_dfs_chnl = pConfig->initial_scan_no_dfs_chnl; @@ -4022,7 +3998,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.Is11hSupportEnabled = pConfig->Is11hSupportEnabled; smeConfig->csrConfig.nTxPowerCap = pConfig->nTxPowerCap; smeConfig->csrConfig.allow_tpc_from_ap = pConfig->allow_tpc_from_ap; - smeConfig->csrConfig.fEnableBypass11d = pConfig->enableBypass11d; smeConfig->csrConfig.fEnableDFSChnlScan = pConfig->enableDFSChnlScan; smeConfig->csrConfig.nRoamPrefer5GHz = pConfig->nRoamPrefer5GHz; smeConfig->csrConfig.nRoamIntraBand = pConfig->nRoamIntraBand; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 0e0d3a6ca3ea..3362ae0f919c 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1074,8 +1074,6 @@ typedef struct tagCsrConfigParam { uint8_t fAllowMCCGODiffBI; tCsr11dinfo Csr11dinfo; - uint16_t vccRssiThreshold; - uint32_t vccUlMacLossThreshold; uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ uint32_t nInitialDwellTime; /* in units of milliseconds */ @@ -1115,13 +1113,6 @@ typedef struct tagCsrConfigParam { * This is mandated by WMM-AC certification */ bool addTSWhenACMIsOff; - /* - * Customer wants to start with an active scan based on the default - * country code. This optimization will minimize the driver load to - * association time. Based on this flag we will bypass the initial - * passive scan needed for 11d to determine the country code & domain - */ - bool fEnableBypass11d; /* * Customer wants to optimize the scan time. Avoiding scans(passive) * on DFS channels while swipping through both bands can save some time diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 8cd5a3348dfe..08950c3700e0 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -429,8 +429,6 @@ struct csr_config { * the channels in the 802.11d IE. */ - uint16_t vccRssiThreshold; - uint32_t vccUlMacLossThreshold; uint32_t nPassiveMaxChnTime; /* in units of milliseconds */ uint32_t nActiveMaxChnTime; /* in units of milliseconds */ @@ -585,13 +583,6 @@ struct csr_scanstruct { * will use the most popular one (max count) */ uint8_t countryCodeElected[WNI_CFG_COUNTRY_CODE_LEN]; - /* - * Customer wants to start with an active scan based on the default - * country code. This optimization will minimize the driver load to - * association time. Based on this flag we will bypass the initial - * passive scan needed for 11d to determine the country code & domain - */ - bool fEnableBypass11d; /* * Customer wants to optimize the scan time. Avoiding scans(passive) * on DFS channels while swipping through both bands can save some time diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index ad16620a5450..18729880240e 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -72,10 +72,6 @@ /* 120 seconds, for WPS */ #define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD (120 * QDF_MC_TIMER_TO_SEC_UNIT) -/* OBIWAN recommends [8 10]% : pick 9% */ -#define CSR_VCC_UL_MAC_LOSS_THRESHOLD 9 -/* OBIWAN recommends -85dBm */ -#define CSR_VCC_RSSI_THRESHOLD 80 #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD 500 /* ms */ #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD_IN_BMPS 2000 /* ms */ #define CSR_MIN_TL_STAT_QUERY_PERIOD 500 /* ms */ @@ -2638,10 +2634,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, csr_assign_rssi_for_category(pMac, pMac->mlme_cfg->lfr.first_scan_bucket_threshold, pParam->bCatRssiOffset); - pMac->roam.configParam.vccRssiThreshold = - pParam->vccRssiThreshold; - pMac->roam.configParam.vccUlMacLossThreshold = - pParam->vccUlMacLossThreshold; pMac->roam.configParam.statsReqPeriodicity = pParam->statsReqPeriodicity; pMac->roam.configParam.statsReqPeriodicityInPS = @@ -2743,7 +2735,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, nRoamBeaconRssiWeight); pMac->roam.configParam.addTSWhenACMIsOff = pParam->addTSWhenACMIsOff; - pMac->scan.fEnableBypass11d = pParam->fEnableBypass11d; pMac->scan.fEnableDFSChnlScan = pParam->fEnableDFSChnlScan; pMac->scan.scanResultCfgAgingTime = pParam->scanCfgAgingTime; pMac->roam.configParam.fScanTwice = pParam->fScanTwice; @@ -2927,14 +2918,11 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->idle_time_conc = cfg_params->idle_time_conc; pParam->nScanResultAgeCount = cfg_params->agingCount; pParam->bCatRssiOffset = cfg_params->bCatRssiOffset; - pParam->vccRssiThreshold = cfg_params->vccRssiThreshold; - pParam->vccUlMacLossThreshold = cfg_params->vccUlMacLossThreshold; pParam->nTxPowerCap = cfg_params->nTxPowerCap; pParam->allow_tpc_from_ap = cfg_params->allow_tpc_from_ap; pParam->statsReqPeriodicity = cfg_params->statsReqPeriodicity; pParam->statsReqPeriodicityInPS = cfg_params->statsReqPeriodicityInPS; pParam->addTSWhenACMIsOff = cfg_params->addTSWhenACMIsOff; - pParam->fEnableBypass11d = pMac->scan.fEnableBypass11d; pParam->fEnableDFSChnlScan = pMac->scan.fEnableDFSChnlScan; pParam->fScanTwice = cfg_params->fScanTwice; pParam->fFirstScanOnly2GChnl = pMac->scan.fFirstScanOnly2GChnl; @@ -17055,16 +17043,6 @@ static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid) sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssid.bytes)); - /* Check for user misconfig of RSSI trigger threshold */ - pMac->roam.configParam.vccRssiThreshold = - (0 == pMac->roam.configParam.vccRssiThreshold) ? - CSR_VCC_RSSI_THRESHOLD : - pMac->roam.configParam.vccRssiThreshold; - /* Check for user misconfig of UL MAC Loss trigger threshold */ - pMac->roam.configParam.vccUlMacLossThreshold = - (0 == pMac->roam.configParam.vccUlMacLossThreshold) ? - CSR_VCC_UL_MAC_LOSS_THRESHOLD : pMac->roam.configParam. - vccUlMacLossThreshold; /* Indicate the neighbor roal algorithm about the connect indication */ csr_roam_get_session_id_from_bssid(pMac, &bssid, &sessionId);