samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove obsolete "num rx antenna" configuration

Browse Source 
Currently cfg.ini supports a "gNumRxAnt" configuration item, and this
is used to override the WNI_CFG_CURRENT_RX_ANTENNA entry in the MAC
CFG database.  However this MAC CFG database entry is no longer in
use, so remove the obsolete support for this configuration item.

Change-Id: I8a8f7ca382262edee187013425fd41598783342c
CRs-Fixed: 1060626
This commit is contained in:
Jeff Johnson
2016-08-29 11:33:57 -07:00
parent 3507908a02
commit 9306c088f0
5 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/hdd/inc/wlan_hdd_cfg.h
View File

@@ -543,11 +543,6 @@ typedef enum {
#define CFG_MAX_LI_MODULATED_DTIM_MAX (10) #define CFG_MAX_LI_MODULATED_DTIM_MAX (10)
#define CFG_MAX_LI_MODULATED_DTIM_DEFAULT (10) #define CFG_MAX_LI_MODULATED_DTIM_DEFAULT (10)
#define CFG_RX_ANT_CONFIGURATION_NAME "gNumRxAnt"
#define CFG_RX_ANT_CONFIGURATION_NAME_MIN (1)
#define CFG_RX_ANT_CONFIGURATION_NAME_MAX (2)
#define CFG_RX_ANT_CONFIGURATION_NAME_DEFAULT (2)
#define CFG_FW_HEART_BEAT_MONITORING_NAME "gEnableFWHeartBeatMonitoring" #define CFG_FW_HEART_BEAT_MONITORING_NAME "gEnableFWHeartBeatMonitoring"
#define CFG_FW_HEART_BEAT_MONITORING_MIN (0) #define CFG_FW_HEART_BEAT_MONITORING_MIN (0)
#define CFG_FW_HEART_BEAT_MONITORING_MAX (1) #define CFG_FW_HEART_BEAT_MONITORING_MAX (1)
@@ -3636,7 +3631,6 @@ struct hdd_config {
bool fIgnoreDtim; bool fIgnoreDtim;
uint8_t fMaxLIModulatedDTIM; uint8_t fMaxLIModulatedDTIM;
uint8_t nRxAnt;
uint8_t fEnableFwHeartBeatMonitoring; uint8_t fEnableFwHeartBeatMonitoring;
uint8_t fEnableFwBeaconFiltering; uint8_t fEnableFwBeaconFiltering;
bool fEnableFwRssiMonitoring; bool fEnableFwRssiMonitoring;

15
core/hdd/src/wlan_hdd_cfg.c
View File

@@ -864,13 +864,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_MAX_LI_MODULATED_DTIM_MIN, CFG_MAX_LI_MODULATED_DTIM_MIN,
CFG_MAX_LI_MODULATED_DTIM_MAX), CFG_MAX_LI_MODULATED_DTIM_MAX),
REG_VARIABLE(CFG_RX_ANT_CONFIGURATION_NAME, WLAN_PARAM_Integer,
struct hdd_config, nRxAnt,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_RX_ANT_CONFIGURATION_NAME_DEFAULT,
CFG_RX_ANT_CONFIGURATION_NAME_MIN,
CFG_RX_ANT_CONFIGURATION_NAME_MAX),
REG_VARIABLE(CFG_FW_HEART_BEAT_MONITORING_NAME, WLAN_PARAM_Integer, REG_VARIABLE(CFG_FW_HEART_BEAT_MONITORING_NAME, WLAN_PARAM_Integer,
struct hdd_config, fEnableFwHeartBeatMonitoring, struct hdd_config, fEnableFwHeartBeatMonitoring,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -6318,14 +6311,6 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx)
hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CFG"); hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CFG");
} }
if (sme_cfg_set_int
(pHddCtx->hHal, WNI_CFG_CURRENT_RX_ANTENNA,
pConfig->nRxAnt) == QDF_STATUS_E_FAILURE) {
fStatus = false;
hddLog(LOGE,
"Could not pass on WNI_CFG_CURRENT_RX_ANTENNA to CFG");
}
if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE,
pConfig->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) { pConfig->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) {
fStatus = false; fStatus = false;

5
core/mac/inc/wni_cfg.h
View File

@@ -97,7 +97,6 @@ enum {
WNI_CFG_11D_ENABLED, WNI_CFG_11D_ENABLED,
WNI_CFG_MAX_TX_POWER_2_4, WNI_CFG_MAX_TX_POWER_2_4,
WNI_CFG_MAX_TX_POWER_5, WNI_CFG_MAX_TX_POWER_5,
WNI_CFG_CURRENT_RX_ANTENNA,
WNI_CFG_CURRENT_TX_POWER_LEVEL, WNI_CFG_CURRENT_TX_POWER_LEVEL,
WNI_CFG_NEW_BSS_FOUND_IND, WNI_CFG_NEW_BSS_FOUND_IND,
WNI_CFG_COUNTRY_CODE, WNI_CFG_COUNTRY_CODE,
@@ -585,10 +584,6 @@ enum {
#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CARRIER 1 #define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CARRIER 1
#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CORRELATION 2 #define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CORRELATION 2
#define WNI_CFG_CURRENT_RX_ANTENNA_STAMIN 1
#define WNI_CFG_CURRENT_RX_ANTENNA_STAMAX 2
#define WNI_CFG_CURRENT_RX_ANTENNA_STADEF 2
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN 0 #define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN 0
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX 128 #define WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMAX 128
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF 27 #define WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF 27

1
core/mac/src/cfg/cfg_param_name.c
View File

@@ -111,7 +111,6 @@ unsigned char *g_cfg_param_name[] = {
(unsigned char *)"NETWORK_DENSITY", (unsigned char *)"NETWORK_DENSITY",
(unsigned char *)"ADAPTIVE_THRESHOLD_ALGORITHM", (unsigned char *)"ADAPTIVE_THRESHOLD_ALGORITHM",
(unsigned char *)"CURRENT_TX_ANTENNA", (unsigned char *)"CURRENT_TX_ANTENNA",
(unsigned char *)"CURRENT_RX_ANTENNA",
(unsigned char *)"CURRENT_TX_POWER_LEVEL", (unsigned char *)"CURRENT_TX_POWER_LEVEL",
(unsigned char *)"NEW_BSS_FOUND_IND", (unsigned char *)"NEW_BSS_FOUND_IND",
(unsigned char *)"PROPRIETARY_RATES_ENABLED", (unsigned char *)"PROPRIETARY_RATES_ENABLED",

6
core/mac/src/cfg/cfg_proc_msg.c
View File

@@ -347,12 +347,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
{WNI_CFG_MAX_TX_POWER_5, {WNI_CFG_MAX_TX_POWER_5,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE, CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
0, 0, 0}, 0, 0, 0},
{WNI_CFG_CURRENT_RX_ANTENNA,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_NTF_HAL,
WNI_CFG_CURRENT_RX_ANTENNA_STAMIN,
WNI_CFG_CURRENT_RX_ANTENNA_STAMAX,
WNI_CFG_CURRENT_RX_ANTENNA_STADEF},
{WNI_CFG_CURRENT_TX_POWER_LEVEL, {WNI_CFG_CURRENT_TX_POWER_LEVEL,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT, CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN, WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN,