diff options
| author | Jeff Johnson <jjohnson@qca.qualcomm.com> | 2014-10-09 14:49:30 -0700 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2014-10-13 20:32:21 +0530 |
| commit | 87c7945653bc79d3fb5579e6bf160969fa86d96d (patch) | |
| tree | 57486b9ce9d4ff8401adc1952bf0fadc7f9af687 | |
| parent | 78e95fd30f782cbbdf9453ce654194d257bba778 (diff) | |
qcacld: cleanup the hdd_config_t config struct
Over time the HDD config struct has supported many configuration
items. In some cases support for a configuration item was removed,
but the associated field in the config struct was not removed. In
other cases a field for new configuration item was added in the middle
of a set of related fields. Remove the unused fields and rearrange
the ones where a group of related fields were separated.
Change-Id: I8d3f57141d9490397df771b6a8c543434a9ed58b
CRs-fixed: 736787
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg.h | 9 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index 2afbb76d942d..d3a9e842e607 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -2592,7 +2592,6 @@ typedef struct //Config parameters v_U32_t RTSThreshold; v_U32_t FragmentationThreshold; - v_U32_t nCheckForHangTime; v_U8_t OperatingChannel; v_BOOL_t ShortSlotTimeEnabled; v_BOOL_t Is11dSupportEnabled; @@ -2605,10 +2604,10 @@ typedef struct char PowerUsageControl[4]; v_U8_t nEnableSuspend; v_U8_t nEnableDriverStop; - v_BOOL_t fIsImpsEnabled; v_BOOL_t fIsLogpEnabled; v_U8_t btcExecutionMode; v_U32_t mwsCoexConfig[6]; + v_BOOL_t fIsImpsEnabled; v_U32_t nImpsModSleepTime; v_U32_t nImpsMaxSleepTime; v_U32_t nImpsMinSleepTime; @@ -2622,9 +2621,7 @@ typedef struct v_U32_t nChannelBondingMode24GHz; v_U32_t nChannelBondingMode5GHz; v_U32_t MaxRxAmpduFactor; - v_U32_t nBAAgingTimerInterval; v_U16_t TxRate; - v_U32_t AdaptiveThresholdAlgo; v_U32_t ShortGI20MhzEnable; v_U32_t BlockAckAutoSetup; v_U32_t ScanResultAgeCount; @@ -2860,14 +2857,14 @@ typedef struct v_U8_t ShortGI40MhzEnable; eHddLinkSpeedReportType reportMaxLinkSpeed; v_S31_t linkSpeedRssiHigh; + v_S31_t linkSpeedRssiMid; + v_S31_t linkSpeedRssiLow; #if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) v_BOOL_t nRoamPrefer5GHz; v_BOOL_t nRoamIntraBand; v_U8_t nProbes; v_U16_t nRoamScanHomeAwayTime; #endif - v_S31_t linkSpeedRssiMid; - v_S31_t linkSpeedRssiLow; v_U8_t enableMCC; v_U8_t allowMCCGODiffBI; v_BOOL_t isP2pDeviceAddrAdministrated; diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 1c95b3a2f157..56ea21917f36 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -427,13 +427,6 @@ REG_TABLE_ENTRY g_registry_table[] = CFG_ENABLE_ENABLE_DRIVER_STOP_MIN, CFG_ENABLE_ENABLE_DRIVER_STOP_MAX ), - REG_VARIABLE( CFG_ENABLE_IMPS_NAME, WLAN_PARAM_Integer, - hdd_config_t, fIsImpsEnabled, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_IMPS_DEFAULT, - CFG_ENABLE_IMPS_MIN, - CFG_ENABLE_IMPS_MAX ), - REG_VARIABLE( CFG_ENABLE_LOGP_NAME, WLAN_PARAM_Integer, hdd_config_t, fIsLogpEnabled, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -441,6 +434,13 @@ REG_TABLE_ENTRY g_registry_table[] = CFG_ENABLE_LOGP_MIN, CFG_ENABLE_LOGP_MAX ), + REG_VARIABLE( CFG_ENABLE_IMPS_NAME, WLAN_PARAM_Integer, + hdd_config_t, fIsImpsEnabled, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_ENABLE_IMPS_DEFAULT, + CFG_ENABLE_IMPS_MIN, + CFG_ENABLE_IMPS_MAX ), + REG_VARIABLE( CFG_IMPS_MINIMUM_SLEEP_TIME_NAME, WLAN_PARAM_Integer, hdd_config_t, nImpsMinSleepTime, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, |