Merge "qcacld-3.0: Remove obsolete "num rx antenna" configuration" into wlan-cld3.driver.lnx.1.1-dev

This commit is contained in:
Service qcabuildsw 2016-09-19 12:38:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit b395d45b47
5 changed files with 0 additions and 33 deletions

View file

@ -543,11 +543,6 @@ typedef enum {
#define CFG_MAX_LI_MODULATED_DTIM_MAX (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_MIN (0)
#define CFG_FW_HEART_BEAT_MONITORING_MAX (1)
@ -3636,7 +3631,6 @@ struct hdd_config {
bool fIgnoreDtim;
uint8_t fMaxLIModulatedDTIM;
uint8_t nRxAnt;
uint8_t fEnableFwHeartBeatMonitoring;
uint8_t fEnableFwBeaconFiltering;
bool fEnableFwRssiMonitoring;

View file

@ -864,13 +864,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_MAX_LI_MODULATED_DTIM_MIN,
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,
struct hdd_config, fEnableFwHeartBeatMonitoring,
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");
}
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,
pConfig->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) {
fStatus = false;

View file

@ -97,7 +97,6 @@ enum {
WNI_CFG_11D_ENABLED,
WNI_CFG_MAX_TX_POWER_2_4,
WNI_CFG_MAX_TX_POWER_5,
WNI_CFG_CURRENT_RX_ANTENNA,
WNI_CFG_CURRENT_TX_POWER_LEVEL,
WNI_CFG_NEW_BSS_FOUND_IND,
WNI_CFG_COUNTRY_CODE,
@ -585,10 +584,6 @@ enum {
#define WNI_CFG_ADAPTIVE_THRESHOLD_ALGORITHM_CARRIER 1
#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_STAMAX 128
#define WNI_CFG_CURRENT_TX_POWER_LEVEL_STADEF 27

View file

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

View file

@ -347,12 +347,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
{WNI_CFG_MAX_TX_POWER_5,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE,
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,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_CURRENT_TX_POWER_LEVEL_STAMIN,