Merge "qcacld-3.0: Remove obsolete "AGC Listen mode" configuration" into wlan-cld3.driver.lnx.1.1-dev
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 1e673a8..8db71c4 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -338,11 +338,6 @@
#define CFG_AP_STA_SECURITY_SEPERATION_MAX (1)
#define CFG_AP_STA_SECURITY_SEPERATION_DEFAULT (0)
-#define CFG_AP_LISTEN_MODE_NAME "gEnablePhyAgcListenMode"
-#define CFG_AP_LISTEN_MODE_MIN (0)
-#define CFG_AP_LISTEN_MODE_MAX (128)
-#define CFG_AP_LISTEN_MODE_DEFAULT (128)
-
#define CFG_AP_AUTO_SHUT_OFF "gAPAutoShutOff"
#define CFG_AP_AUTO_SHUT_OFF_MIN (0)
#define CFG_AP_AUTO_SHUT_OFF_MAX (4294967295UL)
@@ -3556,7 +3551,6 @@
uint16_t apProtection;
bool apOBSSProtEnabled;
bool apDisableIntraBssFwd;
- uint8_t nEnableListenMode;
uint32_t nAPAutoShutOff;
uint8_t enableLTECoex;
uint32_t apKeepAlivePeriod;
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 68f120c..098ad6a 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -1250,13 +1250,6 @@
CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN,
CFG_QOS_IMPLICIT_SETUP_ENABLED_MAX),
- REG_VARIABLE(CFG_AP_LISTEN_MODE_NAME, WLAN_PARAM_Integer,
- struct hdd_config, nEnableListenMode,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_AP_LISTEN_MODE_DEFAULT,
- CFG_AP_LISTEN_MODE_MIN,
- CFG_AP_LISTEN_MODE_MAX),
-
REG_VARIABLE(CFG_AP_AUTO_SHUT_OFF, WLAN_PARAM_Integer,
struct hdd_config, nAPAutoShutOff,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -4895,9 +4888,6 @@
pHddCtx->config->WlanAutoShutdown);
#endif
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
- "Name = [gEnableListenMode] Value = [%u]",
- pHddCtx->config->nEnableListenMode);
- QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApProtection] value = [%u]",
pHddCtx->config->apProtection);
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -6378,14 +6368,6 @@
}
if (sme_cfg_set_int
- (pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE,
- pConfig->nEnableListenMode) == QDF_STATUS_E_FAILURE) {
- fStatus = false;
- hddLog(LOGE,
- "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CFG");
- }
-
- if (sme_cfg_set_int
(pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
pConfig->apKeepAlivePeriod) == QDF_STATUS_E_FAILURE) {
fStatus = false;
diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index eb966bb..910e8ec 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -205,7 +205,6 @@
WNI_CFG_WPS_DEVICE_SUB_CATEGORY,
WNI_CFG_WPS_DEVICE_PASSWORD_ID,
WNI_CFG_LOW_GAIN_OVERRIDE,
- WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE,
WNI_CFG_SINGLE_TID_RC,
WNI_CFG_MCAST_BCAST_FILTER_SETTING,
WNI_CFG_DYNAMIC_PS_POLL_VALUE,
@@ -1077,10 +1076,6 @@
#define WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX 1
#define WNI_CFG_LOW_GAIN_OVERRIDE_STADEF 0
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMIN 0
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMAX 128
-#define WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STADEF 128
-
#define WNI_CFG_SINGLE_TID_RC_STAMIN 0
#define WNI_CFG_SINGLE_TID_RC_STAMAX 1
#define WNI_CFG_SINGLE_TID_RC_STADEF 1
diff --git a/core/mac/src/cfg/cfg_param_name.c b/core/mac/src/cfg/cfg_param_name.c
index 4143a8d..1cab09a 100644
--- a/core/mac/src/cfg/cfg_param_name.c
+++ b/core/mac/src/cfg/cfg_param_name.c
@@ -265,7 +265,6 @@
(unsigned char *)"WPS_DEVICE_PASSWORD_ID",
(unsigned char *)"WPS_ASSOC_METHOD",
(unsigned char *)"LOW_GAIN_OVERRIDE",
- (unsigned char *)"ENABLE_PHY_AGC_LISTEN_MODE",
(unsigned char *)"RPE_POLLING_THRESHOLD",
(unsigned char *)"RPE_AGING_THRESHOLD_FOR_AC0_REG",
(unsigned char *)"RPE_AGING_THRESHOLD_FOR_AC1_REG",
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index a9777ee..29b0090 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -916,12 +916,6 @@
WNI_CFG_LOW_GAIN_OVERRIDE_STAMIN,
WNI_CFG_LOW_GAIN_OVERRIDE_STAMAX,
WNI_CFG_LOW_GAIN_OVERRIDE_STADEF},
- {WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
- CFG_CTL_NTF_HAL,
- WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMIN,
- WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STAMAX,
- WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE_STADEF},
{WNI_CFG_SINGLE_TID_RC,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_SINGLE_TID_RC_STAMIN,