diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c
index 974496440dd1..c9b7ae0a725f 100644
--- a/components/mlme/core/src/wlan_mlme_main.c
+++ b/components/mlme/core/src/wlan_mlme_main.c
@@ -321,8 +321,30 @@ static void mlme_init_edca_params(struct wlan_mlme_edca_params *edca_params)
static void mlme_init_timeout_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_timeout *timeouts)
{
- timeouts->join_failure_timeout = cfg_get(psoc,
- CFG_JOIN_FAILURE_TIMEOUT);
+ timeouts->join_failure_timeout =
+ cfg_get(psoc, CFG_JOIN_FAILURE_TIMEOUT);
+ timeouts->auth_failure_timeout =
+ cfg_get(psoc, CFG_AUTH_FAILURE_TIMEOUT);
+ timeouts->auth_rsp_timeout =
+ cfg_get(psoc, CFG_AUTH_RSP_TIMEOUT);
+ timeouts->assoc_failure_timeout =
+ cfg_get(psoc, CFG_ASSOC_FAILURE_TIMEOUT);
+ timeouts->reassoc_failure_timeout =
+ cfg_get(psoc, CFG_REASSOC_FAILURE_TIMEOUT);
+ timeouts->probe_after_hb_fail_timeout =
+ cfg_get(psoc, CFG_PROBE_AFTER_HB_FAIL_TIMEOUT);
+ timeouts->olbc_detect_timeout =
+ cfg_get(psoc, CFG_OLBC_DETECT_TIMEOUT);
+ timeouts->addts_rsp_timeout =
+ cfg_get(psoc, CFG_ADDTS_RSP_TIMEOUT);
+ timeouts->heart_beat_threshold =
+ cfg_get(psoc, CFG_HEART_BEAT_THRESHOLD);
+ timeouts->ap_keep_alive_timeout =
+ cfg_get(psoc, CFG_AP_KEEP_ALIVE_TIMEOUT);
+ timeouts->ap_link_monitor_timeout =
+ cfg_get(psoc, CFG_AP_LINK_MONITOR_TIMEOUT);
+ timeouts->ps_data_inactivity_timeout =
+ cfg_get(psoc, CFG_PS_DATA_INACTIVITY_TIMEOUT);
}
static void mlme_init_ht_cap_in_cfg(struct wlan_objmgr_psoc *psoc,
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_timeout.h b/components/mlme/dispatcher/inc/cfg_mlme_timeout.h
index 2c2fb1dd27bc..9379a0c4df4e 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_timeout.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_timeout.h
@@ -44,7 +44,259 @@
CFG_VALUE_OR_DEFAULT, \
"Join failure timeout")
+/*
+ *
+ * auth_failure_timeout - Auth failure timeout value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 1000
+ *
+ * This cfg is used to configure the auth failure timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_AUTH_FAILURE_TIMEOUT CFG_INI_UINT( \
+ "auth_failure_timeout", \
+ 0, \
+ 65535, \
+ 1000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "auth failure timeout")
+
+/*
+ *
+ * auth_rsp_timeout - Auth response timeout value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 1000
+ *
+ * This cfg is used to configure the auth response timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_AUTH_RSP_TIMEOUT CFG_INI_UINT( \
+ "auth_rsp_timeout", \
+ 0, \
+ 65535, \
+ 1000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "auth rsp timeout")
+
+/*
+ *
+ * assoc_failure_timeout - Assoc failure timeout value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 2000
+ *
+ * This cfg is used to configure the assoc failure timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_ASSOC_FAILURE_TIMEOUT CFG_INI_UINT( \
+ "assoc_failure_timeout", \
+ 0, \
+ 65535, \
+ 2000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "assoc failure timeout")
+
+/*
+ *
+ * reassoc_failure_timeout - Re-Assoc failure timeout value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 1000
+ *
+ * This cfg is used to configure the re-assoc failure timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_REASSOC_FAILURE_TIMEOUT CFG_INI_UINT( \
+ "reassoc_failure_timeout", \
+ 0, \
+ 65535, \
+ 1000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "reassoc failure timeout")
+
+/*
+ *
+ * probe_after_hb_fail_timeout - Probe after HB failure timeout value
+ * @Min: 10
+ * @Max: 10000
+ * @Default: 70
+ *
+ * This cfg is used to configure the Probe after HB failure timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_PROBE_AFTER_HB_FAIL_TIMEOUT CFG_INI_UINT( \
+ "probe_after_hb_fail_timeout", \
+ 10, \
+ 10000, \
+ 70, \
+ CFG_VALUE_OR_DEFAULT, \
+ "probe after HB fail timeout")
+
+/*
+ *
+ * olbc_detect_timeout - olbc detect timeout value
+ * @Min: 1000
+ * @Max: 30000
+ * @Default: 10000
+ *
+ * This cfg is used to configure the olbc detect timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_OLBC_DETECT_TIMEOUT CFG_INI_UINT( \
+ "olbc_detect_timeout", \
+ 1000, \
+ 30000, \
+ 10000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "OLBC detect timeout")
+
+/*
+ *
+ * addts_rsp_timeout - addts response timeout value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 1000
+ *
+ * This cfg is used to configure the addts response timeout.
+ *
+ * Usage: Internal
+ *
+ *
+ */
+#define CFG_ADDTS_RSP_TIMEOUT CFG_INI_UINT( \
+ "addts_rsp_timeout", \
+ 0, \
+ 65535, \
+ 1000, \
+ CFG_VALUE_OR_DEFAULT, \
+ "ADDTS RSP timeout")
+
+/*
+ *
+ * gHeartbeat24 - Heart beat threashold value
+ * @Min: 0
+ * @Max: 65535
+ * @Default: 40
+ *
+ * This cfg is used to configure the Heart beat threashold.
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_HEART_BEAT_THRESHOLD CFG_INI_UINT( \
+ "gHeartbeat24", \
+ 0, \
+ 65535, \
+ 40, \
+ CFG_VALUE_OR_DEFAULT, \
+ "Heart beat threashold")
+
+/*
+ *
+ * gApKeepAlivePeriod - AP keep alive period
+ * @Min: 1
+ * @Max: 65535
+ * @Default: 20
+ *
+ * This ini is used to set keep alive period of AP
+ *
+ * Related: None.
+ *
+ * Supported Feature: SAP
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_AP_KEEP_ALIVE_TIMEOUT CFG_INI_UINT( \
+ "gApKeepAlivePeriod", \
+ 1, \
+ 65535, \
+ 20, \
+ CFG_VALUE_OR_DEFAULT, \
+ "AP keep alive timeout")
+
+/*
+ *
+ * gApLinkMonitorPeriod - AP keep alive period
+ * @Min: 3
+ * @Max: 50
+ * @Default: 10
+ *
+ * This ini is used to configure AP link monitor timeout value
+ *
+ * Related: None.
+ *
+ * Supported Feature: SAP
+ *
+ * Usage: Internal/External
+ *
+ *
+ */
+#define CFG_AP_LINK_MONITOR_TIMEOUT CFG_INI_UINT( \
+ "gApLinkMonitorPeriod", \
+ 3, \
+ 50, \
+ 10, \
+ CFG_VALUE_OR_DEFAULT, \
+ "AP link monitor timeout")
+
+/*
+ *
+ * gDataInactivityTimeout - Data activity timeout for non wow mode.
+ * @Min: 1
+ * @Max: 255
+ * @Default: 200
+ *
+ * This ini is used to set data inactivity timeout in non wow mode.
+ *
+ * Supported Feature: inactivity timeout in non wow mode
+ *
+ * Usage: External
+ *
+ *
+ */
+#define CFG_PS_DATA_INACTIVITY_TIMEOUT CFG_INI_UINT( \
+ "gDataInactivityTimeout", \
+ 1, \
+ 255, \
+ 200, \
+ CFG_VALUE_OR_DEFAULT, \
+ "PS data inactivity timeout")
+
#define CFG_TIMEOUT_ALL \
- CFG(CFG_JOIN_FAILURE_TIMEOUT)
+ CFG(CFG_JOIN_FAILURE_TIMEOUT) \
+ CFG(CFG_AUTH_FAILURE_TIMEOUT) \
+ CFG(CFG_AUTH_RSP_TIMEOUT) \
+ CFG(CFG_ASSOC_FAILURE_TIMEOUT) \
+ CFG(CFG_REASSOC_FAILURE_TIMEOUT) \
+ CFG(CFG_PROBE_AFTER_HB_FAIL_TIMEOUT) \
+ CFG(CFG_OLBC_DETECT_TIMEOUT) \
+ CFG(CFG_ADDTS_RSP_TIMEOUT) \
+ CFG(CFG_HEART_BEAT_THRESHOLD) \
+ CFG(CFG_AP_KEEP_ALIVE_TIMEOUT) \
+ CFG(CFG_AP_LINK_MONITOR_TIMEOUT) \
+ CFG(CFG_PS_DATA_INACTIVITY_TIMEOUT)
#endif /* __CFG_MLME_TIMEOUT_H */
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
index 21eeee5580b3..e1ca74561bfe 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
@@ -842,9 +842,31 @@ struct wlan_mlme_threshold {
/*
* struct wlan_mlme_timeout - mlme timeout related config items
* @join_failure_timeout: join failure timeout
+ * @auth_failure_timeout: authenticate failure timeout
+ * @auth_rsp_timeout: authenticate response timeout
+ * @assoc_failure_timeout: assoc failure timeout
+ * @reassoc_failure_timeout: re-assoc failure timeout
+ * @probe_after_hb_fail_timeout: Probe after HB fail timeout
+ * @olbc_detect_timeout: OLBC detect timeout
+ * @addts_rsp_timeout: ADDTS rsp timeout value
+ * @heart_beat_threshold: Heart beat threshold
+ * @ap_keep_alive_timeout: AP keep alive timeout value
+ * @ap_link_monitor_timeout: AP link monitor timeout value
+ * @ps_data_inactivity_timeout: PS data inactivity timeout
*/
struct wlan_mlme_timeout {
uint32_t join_failure_timeout;
+ uint32_t auth_failure_timeout;
+ uint32_t auth_rsp_timeout;
+ uint32_t assoc_failure_timeout;
+ uint32_t reassoc_failure_timeout;
+ uint32_t probe_after_hb_fail_timeout;
+ uint32_t olbc_detect_timeout;
+ uint32_t addts_rsp_timeout;
+ uint32_t heart_beat_threshold;
+ uint32_t ap_keep_alive_timeout;
+ uint32_t ap_link_monitor_timeout;
+ uint32_t ps_data_inactivity_timeout;
};
/**
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 29038408a644..16d5a827d6f9 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -184,11 +184,6 @@ struct hdd_context;
#define CFG_COUNTRY_CODE_PRIORITY_MAX (1)
#define CFG_COUNTRY_CODE_PRIORITY_DEFAULT (0)
-#define CFG_HEARTBEAT_THRESH_24_NAME "gHeartbeat24"
-#define CFG_HEARTBEAT_THRESH_24_MIN WNI_CFG_HEART_BEAT_THRESHOLD_STAMIN
-#define CFG_HEARTBEAT_THRESH_24_MAX WNI_CFG_HEART_BEAT_THRESHOLD_STAMAX
-#define CFG_HEARTBEAT_THRESH_24_DEFAULT WNI_CFG_HEART_BEAT_THRESHOLD_STADEF
-
/*
*
* gMaxRxAmpduFactor - Provide the maximum ampdu factor.
@@ -2396,50 +2391,6 @@ enum hdd_dot11_mode {
#define CFG_AP_STA_SECURITY_SEPERATION_MAX (1)
#define CFG_AP_STA_SECURITY_SEPERATION_DEFAULT (0)
-/*
- *
- * gApKeepAlivePeriod - AP keep alive period
- * @Min: 1
- * @Max: 65535
- * @Default: 20
- *
- * This ini is used to set keep alive period of AP
- *
- * Related: None.
- *
- * Supported Feature: SAP
- *
- * Usage: Internal/External
- *
- *
- */
-#define CFG_AP_KEEP_ALIVE_PERIOD_NAME "gApKeepAlivePeriod"
-#define CFG_AP_KEEP_ALIVE_PERIOD_MIN WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMIN
-#define CFG_AP_KEEP_ALIVE_PERIOD_MAX WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMAX
-#define CFG_AP_KEEP_ALIVE_PERIOD_DEFAULT WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STADEF
-
-/*
- *
- * gApLinkMonitorPeriod - AP keep alive period
- * @Min: 3
- * @Max: 50
- * @Default: 10
- *
- * This ini is used to configure AP link monitor timeout value
- *
- * Related: None.
- *
- * Supported Feature: SAP
- *
- * Usage: Internal/External
- *
- *
- */
-#define CFG_AP_LINK_MONITOR_PERIOD_NAME "gApLinkMonitorPeriod"
-#define CFG_AP_LINK_MONITOR_PERIOD_MIN (3)
-#define CFG_AP_LINK_MONITOR_PERIOD_MAX (50)
-#define CFG_AP_LINK_MONITOR_PERIOD_DEFAULT (10)
-
#ifdef FEATURE_WLAN_AUTO_SHUTDOWN
#define CFG_WLAN_AUTO_SHUTDOWN "gWlanAutoShutdown"
#define CFG_WLAN_AUTO_SHUTDOWN_MIN (0)
@@ -2748,27 +2699,6 @@ enum hdd_dot11_mode {
#define CFG_FW_MCC_BCAST_PROB_RESP_MAX (1)
#define CFG_FW_MCC_BCAST_PROB_RESP_DEFAULT (0)
-/*
- *
- * gDataInactivityTimeout - Data activity timeout for non wow mode.
- * @Min: 1
- * @Max: 255
- * @Default: 200
- *
- * This ini is used to set data inactivity timeout in non wow mode.
- *
- * Supported Feature: inactivity timeout in non wow mode
- *
- * Usage: External
- *
- *
- */
-
-#define CFG_DATA_INACTIVITY_TIMEOUT_NAME "gDataInactivityTimeout"
-#define CFG_DATA_INACTIVITY_TIMEOUT_MIN (1)
-#define CFG_DATA_INACTIVITY_TIMEOUT_MAX (255)
-#define CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT (200)
-
/*
*
* g_wow_data_inactivity_timeout - Data activity timeout in wow mode.
@@ -9814,7 +9744,6 @@ struct hdd_config {
bool Is11dSupportEnabled;
bool Is11hSupportEnabled;
bool fSupplicantCountryCodeHasPriority;
- uint32_t HeartbeatThresh24;
char PowerUsageControl[4];
bool fIsImpsEnabled;
bool is_ps_enabled;
@@ -9842,9 +9771,7 @@ struct hdd_config {
uint16_t apProtection;
bool apOBSSProtEnabled;
bool apDisableIntraBssFwd;
- uint32_t apKeepAlivePeriod;
enum station_keepalive_method sta_keepalive_method;
- uint32_t apLinkMonitorPeriod;
uint8_t nTxPowerCap; /* In dBm */
bool allow_tpc_from_ap;
uint8_t disablePacketFilter;
@@ -9911,7 +9838,6 @@ struct hdd_config {
bool mcc_rts_cts_prot_enable;
bool mcc_bcast_prob_resp_enable;
- uint8_t nDataInactivityTimeout;
uint8_t wow_data_inactivity_timeout;
/* WMM QoS Configuration */
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index fecb8dcd60b9..fa4a4b6f29b7 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -411,13 +411,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_COUNTRY_CODE_PRIORITY_MIN,
CFG_COUNTRY_CODE_PRIORITY_MAX),
- REG_VARIABLE(CFG_HEARTBEAT_THRESH_24_NAME, WLAN_PARAM_Integer,
- struct hdd_config, HeartbeatThresh24,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_HEARTBEAT_THRESH_24_DEFAULT,
- CFG_HEARTBEAT_THRESH_24_MIN,
- CFG_HEARTBEAT_THRESH_24_MAX),
-
REG_VARIABLE_STRING(CFG_POWER_USAGE_NAME, WLAN_PARAM_String,
struct hdd_config, PowerUsageControl,
VAR_FLAGS_OPTIONAL,
@@ -614,20 +607,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_ENABLE_SAP_MANDATORY_CHAN_LIST_MIN,
CFG_ENABLE_SAP_MANDATORY_CHAN_LIST_MAX),
- REG_VARIABLE(CFG_AP_KEEP_ALIVE_PERIOD_NAME, WLAN_PARAM_Integer,
- struct hdd_config, apKeepAlivePeriod,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_AP_KEEP_ALIVE_PERIOD_DEFAULT,
- CFG_AP_KEEP_ALIVE_PERIOD_MIN,
- CFG_AP_KEEP_ALIVE_PERIOD_MAX),
-
- REG_VARIABLE(CFG_AP_LINK_MONITOR_PERIOD_NAME, WLAN_PARAM_Integer,
- struct hdd_config, apLinkMonitorPeriod,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_AP_LINK_MONITOR_PERIOD_DEFAULT,
- CFG_AP_LINK_MONITOR_PERIOD_MIN,
- CFG_AP_LINK_MONITOR_PERIOD_MAX),
-
REG_VARIABLE(CFG_DISABLE_PACKET_FILTER, WLAN_PARAM_Integer,
struct hdd_config, disablePacketFilter,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -761,13 +740,6 @@ struct reg_table_entry g_registry_table[] = {
CFG_FW_MCC_BCAST_PROB_RESP_MIN,
CFG_FW_MCC_BCAST_PROB_RESP_MAX),
- REG_VARIABLE(CFG_DATA_INACTIVITY_TIMEOUT_NAME, WLAN_PARAM_Integer,
- struct hdd_config, nDataInactivityTimeout,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_DATA_INACTIVITY_TIMEOUT_DEFAULT,
- CFG_DATA_INACTIVITY_TIMEOUT_MIN,
- CFG_DATA_INACTIVITY_TIMEOUT_MAX),
-
REG_VARIABLE(CFG_WOW_DATA_INACTIVITY_TIMEOUT_NAME, WLAN_PARAM_Integer,
struct hdd_config, wow_data_inactivity_timeout,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -5304,12 +5276,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Couldn't pass on WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME to CFG");
}
- if (sme_cfg_set_int(mac_handle, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
- config->nDataInactivityTimeout) == QDF_STATUS_E_FAILURE) {
- status = false;
- hdd_err("Couldn't pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT to CFG");
- }
-
if (sme_cfg_set_int(mac_handle,
WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
config->wow_data_inactivity_timeout) == QDF_STATUS_E_FAILURE) {
@@ -5317,18 +5283,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Fail to pass WNI_CFG_PS_WOW_DATA_INACTIVITY_TO CFG");
}
- if (sme_cfg_set_int(mac_handle, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
- config->apKeepAlivePeriod) == QDF_STATUS_E_FAILURE) {
- status = false;
- hdd_err("Couldn't pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CFG");
- }
-
- if (sme_cfg_set_int(mac_handle, WNI_CFG_AP_LINK_MONITOR_TIMEOUT,
- config->apLinkMonitorPeriod) == QDF_STATUS_E_FAILURE) {
- status = false;
- hdd_err("Couldn't pass on WNI_CFG_AP_LINK_MONITOR_TIMEOUT to CFG");
- }
-
if (sme_cfg_set_int(mac_handle, WNI_CFG_11D_ENABLED,
config->Is11dSupportEnabled) == QDF_STATUS_E_FAILURE) {
status = false;
@@ -5342,12 +5296,6 @@ bool hdd_update_config_cfg(struct hdd_context *hdd_ctx)
hdd_err("Failure: Couldn't set value for WNI_CFG_DFS_MASTER_ENABLED");
}
- if (sme_cfg_set_int(mac_handle, WNI_CFG_HEART_BEAT_THRESHOLD,
- config->HeartbeatThresh24) == QDF_STATUS_E_FAILURE) {
- status = false;
- hdd_err("Couldn't pass on WNI_CFG_HEART_BEAT_THRESHOLD to CFG");
- }
-
if (sme_cfg_set_int(mac_handle, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
config->enableMCCAdaptiveScheduler) ==
QDF_STATUS_E_FAILURE) {
@@ -5488,7 +5436,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
*/
smeConfig->csrConfig.shortSlotTime = pConfig->ShortSlotTimeEnabled;
smeConfig->csrConfig.Is11dSupportEnabled = pConfig->Is11dSupportEnabled;
- smeConfig->csrConfig.HeartbeatThresh24 = pConfig->HeartbeatThresh24;
smeConfig->csrConfig.phyMode =
hdd_cfg_xlate_to_csr_phy_mode(pConfig->dot11Mode);
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 17b5a00998d9..b7abdbcf34f2 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -100,6 +100,7 @@
#include "wlan_cp_stats_mc_ucfg_api.h"
#include "wlan_mlme_ucfg_api.h"
#include "cfg_mlme_sta.h"
+#include "wlan_mlme_public_struct.h"
#include "cfg_ucfg_api.h"
#include "wlan_mlme_public_struct.h"
#include "cfg_ucfg_api.h"
@@ -4195,12 +4196,13 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!mac_handle)
return -EINVAL;
- if ((set_value < CFG_DATA_INACTIVITY_TIMEOUT_MIN) ||
- (set_value > CFG_DATA_INACTIVITY_TIMEOUT_MAX) ||
- (sme_cfg_set_int(mac_handle,
- WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
- set_value) == QDF_STATUS_E_FAILURE)) {
- hdd_err("WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT failed");
+ if (cfg_in_range(CFG_PS_DATA_INACTIVITY_TIMEOUT, set_value)) {
+ tpAniSirGlobal mac_ctx = PMAC_STRUCT(mac_handle);
+
+ mac_ctx->mlme_cfg->timeouts.ps_data_inactivity_timeout =
+ set_value;
+ } else {
+ hdd_err("Invalid inactivity timeout %d", set_value);
ret = -EINVAL;
}
break;
diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index 6fdab3950619..73b48f0fd5d2 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -32,11 +32,6 @@ enum {
WNI_CFG_DTIM_PERIOD,
WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
- WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
- WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
WNI_CFG_SUPPORTED_RATES_11B,
WNI_CFG_SUPPORTED_RATES_11A,
WNI_CFG_DOT11_MODE,
@@ -47,20 +42,16 @@ enum {
WNI_CFG_APSD_ENABLED,
WNI_CFG_SHORT_PREAMBLE,
WNI_CFG_QOS_ENABLED,
- WNI_CFG_HEART_BEAT_THRESHOLD,
- WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
WNI_CFG_11D_ENABLED,
WNI_CFG_MAX_TX_POWER_2_4,
WNI_CFG_MAX_TX_POWER_5,
WNI_CFG_CURRENT_TX_POWER_LEVEL,
WNI_CFG_COUNTRY_CODE,
WNI_CFG_11H_ENABLED,
- WNI_CFG_OLBC_DETECT_TIMEOUT,
WNI_CFG_11G_SHORT_PREAMBLE_ENABLED,
WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
WNI_CFG_11G_ONLY_POLICY,
WNI_CFG_WME_ENABLED,
- WNI_CFG_ADDTS_RSP_TIMEOUT,
WNI_CFG_MAX_SP_LENGTH,
WNI_CFG_WSM_ENABLED,
WNI_CFG_EDCA_PROFILE,
@@ -127,10 +118,8 @@ enum {
WNI_CFG_TELE_BCN_MAX_LI,
WNI_CFG_ASSOC_STA_LIMIT,
WNI_CFG_ENABLE_LTE_COEX,
- WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP,
- WNI_CFG_AP_LINK_MONITOR_TIMEOUT,
WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
WNI_CFG_IBSS_ATIM_WIN_SIZE,
WNI_CFG_DFS_MASTER_ENABLED,
@@ -324,22 +313,6 @@ enum {
#define WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STAMAX 65535
#define WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STADEF 110
-#define WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STAMIN 0
-#define WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STAMAX 65535
-#define WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STADEF 1000
-
-#define WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STAMIN 0
-#define WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STAMAX 65535
-#define WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STADEF 1000
-
-#define WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STAMIN 0
-#define WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STAMAX 65535
-#define WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STADEF 2000
-
-#define WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMIN 0
-#define WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMAX 65535
-#define WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STADEF 1000
-
#define WNI_CFG_PS_ENABLE_BCN_FILTER_STAMIN 0
#define WNI_CFG_PS_ENABLE_BCN_FILTER_STAMAX 1
#define WNI_CFG_PS_ENABLE_BCN_FILTER_STADEF 1
@@ -352,10 +325,6 @@ enum {
#define WNI_CFG_PS_ENABLE_RSSI_MONITOR_STAMAX 1
#define WNI_CFG_PS_ENABLE_RSSI_MONITOR_STADEF 0
-#define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMIN 1
-#define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMAX 255
-#define WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF 200
-
#define WNI_CFG_RF_SETTLING_TIME_CLK_STAMIN 0
#define WNI_CFG_RF_SETTLING_TIME_CLK_STAMAX 60000
#define WNI_CFG_RF_SETTLING_TIME_CLK_STADEF 1500
@@ -502,14 +471,6 @@ enum {
#define WNI_CFG_BACKGROUND_SCAN_PERIOD_STAMAX 180000
#define WNI_CFG_BACKGROUND_SCAN_PERIOD_STADEF 5000
-#define WNI_CFG_HEART_BEAT_THRESHOLD_STAMIN 0
-#define WNI_CFG_HEART_BEAT_THRESHOLD_STAMAX 65535
-#define WNI_CFG_HEART_BEAT_THRESHOLD_STADEF 40
-
-#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMIN 10
-#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMAX 10000
-#define WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STADEF 70
-
#define WNI_CFG_11D_ENABLED_STAMIN 0
#define WNI_CFG_11D_ENABLED_STAMAX 1
#define WNI_CFG_11D_ENABLED_STADEF 1
@@ -530,10 +491,6 @@ enum {
#define WNI_CFG_11H_ENABLED_STAMAX 1
#define WNI_CFG_11H_ENABLED_STADEF 1
-#define WNI_CFG_OLBC_DETECT_TIMEOUT_STAMIN 1000
-#define WNI_CFG_OLBC_DETECT_TIMEOUT_STAMAX 30000
-#define WNI_CFG_OLBC_DETECT_TIMEOUT_STADEF 10000
-
#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMIN 0
#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STAMAX 1
#define WNI_CFG_11G_SHORT_PREAMBLE_ENABLED_STADEF 0
@@ -550,10 +507,6 @@ enum {
#define WNI_CFG_WME_ENABLED_STAMAX 1
#define WNI_CFG_WME_ENABLED_STADEF 1
-#define WNI_CFG_ADDTS_RSP_TIMEOUT_STAMIN 0
-#define WNI_CFG_ADDTS_RSP_TIMEOUT_STAMAX 65535
-#define WNI_CFG_ADDTS_RSP_TIMEOUT_STADEF 1000
-
#define WNI_CFG_MAX_SP_LENGTH_STAMIN 0
#define WNI_CFG_MAX_SP_LENGTH_STAMAX 3
#define WNI_CFG_MAX_SP_LENGTH_STADEF 0
@@ -935,10 +888,6 @@ enum {
#define WNI_CFG_ENABLE_LTE_COEX_STAMAX 1
#define WNI_CFG_ENABLE_LTE_COEX_STADEF 0
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMIN 1
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMAX 65535
-#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STADEF 20
-
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN 0
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX 1
#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STADEF 0
@@ -947,10 +896,6 @@ enum {
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX 1
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF 0
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STAMIN 1
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STAMAX 255
-#define WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STADEF 3
-
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN 100
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX 1000
#define WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF 300
diff --git a/core/mac/src/cfg/cfg_param_name.c b/core/mac/src/cfg/cfg_param_name.c
index c6535d9b049d..403a4698e493 100644
--- a/core/mac/src/cfg/cfg_param_name.c
+++ b/core/mac/src/cfg/cfg_param_name.c
@@ -47,11 +47,6 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_DTIM_PERIOD);
CASE_RETURN_STRING(WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME);
CASE_RETURN_STRING(WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME);
- CASE_RETURN_STRING(WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT);
- CASE_RETURN_STRING(WNI_CFG_AUTHENTICATE_RSP_TIMEOUT);
- CASE_RETURN_STRING(WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT);
- CASE_RETURN_STRING(WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT);
- CASE_RETURN_STRING(WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_SUPPORTED_RATES_11B);
CASE_RETURN_STRING(WNI_CFG_SUPPORTED_RATES_11A);
CASE_RETURN_STRING(WNI_CFG_DOT11_MODE);
@@ -62,20 +57,16 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_APSD_ENABLED);
CASE_RETURN_STRING(WNI_CFG_SHORT_PREAMBLE);
CASE_RETURN_STRING(WNI_CFG_QOS_ENABLED);
- CASE_RETURN_STRING(WNI_CFG_HEART_BEAT_THRESHOLD);
- CASE_RETURN_STRING(WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_11D_ENABLED);
CASE_RETURN_STRING(WNI_CFG_MAX_TX_POWER_2_4);
CASE_RETURN_STRING(WNI_CFG_MAX_TX_POWER_5);
CASE_RETURN_STRING(WNI_CFG_CURRENT_TX_POWER_LEVEL);
CASE_RETURN_STRING(WNI_CFG_COUNTRY_CODE);
CASE_RETURN_STRING(WNI_CFG_11H_ENABLED);
- CASE_RETURN_STRING(WNI_CFG_OLBC_DETECT_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_11G_SHORT_PREAMBLE_ENABLED);
CASE_RETURN_STRING(WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED);
CASE_RETURN_STRING(WNI_CFG_11G_ONLY_POLICY);
CASE_RETURN_STRING(WNI_CFG_WME_ENABLED);
- CASE_RETURN_STRING(WNI_CFG_ADDTS_RSP_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_MAX_SP_LENGTH);
CASE_RETURN_STRING(WNI_CFG_WSM_ENABLED);
CASE_RETURN_STRING(WNI_CFG_EDCA_PROFILE);
@@ -141,10 +132,8 @@ const char *cfg_get_string(uint16_t cfg_id)
CASE_RETURN_STRING(WNI_CFG_TELE_BCN_MAX_LI);
CASE_RETURN_STRING(WNI_CFG_ASSOC_STA_LIMIT);
CASE_RETURN_STRING(WNI_CFG_ENABLE_LTE_COEX);
- CASE_RETURN_STRING(WNI_CFG_AP_KEEP_ALIVE_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED);
CASE_RETURN_STRING(WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP);
- CASE_RETURN_STRING(WNI_CFG_AP_LINK_MONITOR_TIMEOUT);
CASE_RETURN_STRING(WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY);
CASE_RETURN_STRING(WNI_CFG_IBSS_ATIM_WIN_SIZE);
CASE_RETURN_STRING(WNI_CFG_DFS_MASTER_ENABLED);
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index d860b78a3430..0e4eefd12dc9 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -63,32 +63,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STAMIN,
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STAMAX,
WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME_STADEF},
- {WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STAMIN,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STAMAX,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT_STADEF},
- {WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STAMIN,
- WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STAMAX,
- WNI_CFG_AUTHENTICATE_RSP_TIMEOUT_STADEF},
- {WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
- CFG_CTL_NTF_LIM,
- WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STAMIN,
- WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STAMAX,
- WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT_STADEF},
- {WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMIN,
- WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STAMAX,
- WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT_STADEF},
- {WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMIN,
- WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STAMAX,
- WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT_STADEF},
{WNI_CFG_SUPPORTED_RATES_11B,
CFG_CTL_VALID | CFG_CTL_RE,
0, 3, 1},
@@ -133,18 +107,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_QOS_ENABLED_STAMIN,
WNI_CFG_QOS_ENABLED_STAMAX,
WNI_CFG_QOS_ENABLED_STADEF},
- {WNI_CFG_HEART_BEAT_THRESHOLD,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
- CFG_CTL_NTF_LIM,
- WNI_CFG_HEART_BEAT_THRESHOLD_STAMIN,
- WNI_CFG_HEART_BEAT_THRESHOLD_STAMAX,
- WNI_CFG_HEART_BEAT_THRESHOLD_STADEF},
- {WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE |
- CFG_CTL_INT,
- WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMIN,
- WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STAMAX,
- WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT_STADEF},
{WNI_CFG_11D_ENABLED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
@@ -171,11 +133,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_11H_ENABLED_STAMIN,
WNI_CFG_11H_ENABLED_STAMAX,
WNI_CFG_11H_ENABLED_STADEF},
- {WNI_CFG_OLBC_DETECT_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_OLBC_DETECT_TIMEOUT_STAMIN,
- WNI_CFG_OLBC_DETECT_TIMEOUT_STAMAX,
- WNI_CFG_OLBC_DETECT_TIMEOUT_STADEF},
{WNI_CFG_11G_SHORT_PREAMBLE_ENABLED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT |
CFG_CTL_RESTART,
@@ -199,11 +156,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_WME_ENABLED_STAMIN,
WNI_CFG_WME_ENABLED_STAMAX,
WNI_CFG_WME_ENABLED_STADEF},
- {WNI_CFG_ADDTS_RSP_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_ADDTS_RSP_TIMEOUT_STAMIN,
- WNI_CFG_ADDTS_RSP_TIMEOUT_STAMAX,
- WNI_CFG_ADDTS_RSP_TIMEOUT_STADEF},
{WNI_CFG_MAX_SP_LENGTH,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_MAX_SP_LENGTH_STAMIN,
@@ -581,11 +533,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_ENABLE_LTE_COEX_STAMIN,
WNI_CFG_ENABLE_LTE_COEX_STAMAX,
WNI_CFG_ENABLE_LTE_COEX_STADEF},
- {WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMIN,
- WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STAMAX,
- WNI_CFG_AP_KEEP_ALIVE_TIMEOUT_STADEF},
{WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMIN,
@@ -596,11 +543,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMIN,
WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX,
WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF},
- {WNI_CFG_AP_LINK_MONITOR_TIMEOUT,
- CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
- WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STAMIN,
- WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STAMAX,
- WNI_CFG_AP_LINK_MONITOR_TIMEOUT_STADEF},
{WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN,
diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h
index 92ec54c54bd2..2f19145804d7 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -198,7 +198,6 @@ typedef enum eLimDot11hChanSwStates {
typedef struct sLimMlmAuthReq {
tSirMacAddr peerMacAddr;
tAniAuthType authType;
- uint32_t authFailureTimeout;
uint8_t sessionId;
} tLimMlmAuthReq, *tpLimMlmAuthReq;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index fea9633b5d27..87adb146615b 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -306,14 +306,7 @@ static QDF_STATUS __lim_init_config(tpAniSirGlobal pMac)
return QDF_STATUS_E_FAILURE;
}
- /* WNI_CFG_HEART_BEAT_THRESHOLD */
-
- if (wlan_cfg_get_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, &val1) !=
- QDF_STATUS_SUCCESS) {
- pe_err("could not retrieve WNI_CFG_HEART_BEAT_THRESHOLD CFG");
- return QDF_STATUS_E_FAILURE;
- }
- if (!val1) {
+ if (!pMac->mlme_cfg->timeouts.heart_beat_threshold) {
pMac->sys.gSysEnableLinkMonitorMode = 0;
} else {
/* No need to activate the timer during init time. */
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 30781b14e6e2..2819cb9fc4a4 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -35,6 +35,7 @@
#include "wni_cfg.h"
#include "cfg_api.h"
+#include "cfg_ucfg_api.h"
#include "sch_api.h"
#include "utils_api.h"
@@ -3159,7 +3160,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
{
tSirMacSSid current_ssid;
tLimMlmJoinCnf mlm_join_cnf;
- uint32_t val = 0;
+ uint32_t val;
uint32_t *noa_duration_from_beacon = NULL;
uint32_t *noa2_duration_from_beacon = NULL;
uint32_t noa;
@@ -3231,14 +3232,14 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
MAX_NOA_PERIOD_IN_MICROSECS : noa;
noa = noa / 1000; /* Convert to ms */
- if (wlan_cfg_get_int(mac_ctx,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, &val) ==
- QDF_STATUS_SUCCESS) {
- session_entry->defaultAuthFailureTimeout = val;
- cfg_set_int(mac_ctx,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- val + noa);
- }
+ session_entry->defaultAuthFailureTimeout =
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout;
+ val = mac_ctx->mlme_cfg->timeouts.auth_failure_timeout + noa;
+ if (cfg_in_range(CFG_AUTH_FAILURE_TIMEOUT, val))
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout = val;
+ else
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout =
+ cfg_default(CFG_AUTH_FAILURE_TIMEOUT);
} else {
session_entry->defaultAuthFailureTimeout = 0;
}
@@ -4688,14 +4689,7 @@ void lim_init_pre_auth_timer_table(tpAniSirGlobal pMac,
tLimPreAuthNode **pAuthNode = pPreAuthTimerTable->pTable;
/* Get AUTH_RSP Timers value */
-
- if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
- &cfgValue) != QDF_STATUS_SUCCESS) {
- pe_err("could not retrieve AUTH_RSP timeout value");
- return;
- }
-
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(pMac->mlme_cfg->timeouts.auth_rsp_timeout);
for (authNodeIdx = 0; authNodeIdx < pPreAuthTimerTable->numEntry;
authNodeIdx++) {
if (tx_timer_create(pMac, &(pAuthNode[authNodeIdx]->timer),
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index 3bd612488470..10b98226885a 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -33,7 +33,7 @@
#include "wni_cfg.h"
#include "ani_global.h"
#include "cfg_api.h"
-
+#include "cfg_ucfg_api.h"
#include "utils_api.h"
#include "lim_utils.h"
#include "lim_assoc_utils.h"
@@ -1176,10 +1176,18 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
/* Restore default failure timeout */
if (QDF_P2P_CLIENT_MODE == pe_session->pePersona &&
- pe_session->defaultAuthFailureTimeout) {
+ pe_session->defaultAuthFailureTimeout) {
pe_debug("Restore default failure timeout");
- cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- pe_session->defaultAuthFailureTimeout);
+ if (cfg_in_range(CFG_AUTH_FAILURE_TIMEOUT,
+ pe_session->defaultAuthFailureTimeout)) {
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout =
+ pe_session->defaultAuthFailureTimeout;
+ } else {
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout =
+ cfg_default(CFG_AUTH_FAILURE_TIMEOUT);
+ pe_session->defaultAuthFailureTimeout =
+ cfg_default(CFG_AUTH_FAILURE_TIMEOUT);
+ }
}
rx_auth_frame = qdf_mem_malloc(sizeof(tSirMacAuthFrameBody));
diff --git a/core/mac/src/pe/lim/lim_process_cfg_updates.c b/core/mac/src/pe/lim/lim_process_cfg_updates.c
index d0c82430dba7..b1b15946676b 100644
--- a/core/mac/src/pe/lim/lim_process_cfg_updates.c
+++ b/core/mac/src/pe/lim/lim_process_cfg_updates.c
@@ -168,15 +168,6 @@ void lim_handle_cf_gparam_update(tpAniSirGlobal pMac, uint32_t cfgId)
pe_debug("Handling CFG parameter id %X update", cfgId);
switch (cfgId) {
- case WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT:
- if (pMac->lim.gLimMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE) {
- /* 'Change' timer for future activations */
- lim_deactivate_and_change_timer(pMac,
- eLIM_ASSOC_FAIL_TIMER);
- }
-
- break;
-
case WNI_CFG_MPDU_DENSITY:
if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &val1) !=
QDF_STATUS_SUCCESS) {
diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
index b8303a28fe63..8d68612aaecd 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
@@ -625,18 +625,6 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf,
qdf_mem_copy(pMlmReassocReq->peerMacAddr,
psessionEntry->bssId, sizeof(tSirMacAddr));
- if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- (uint32_t *) &pMlmReassocReq->reassocFailureTimeout)
- != QDF_STATUS_SUCCESS) {
- /**
- * Could not get ReassocFailureTimeout value
- * from CFG. Log error.
- */
- pe_err("could not retrieve ReassocFailureTimeout value");
- qdf_mem_free(pMlmReassocReq);
- return;
- }
-
if (cfg_get_capability_info(pMac, &caps, psessionEntry) !=
QDF_STATUS_SUCCESS) {
/**
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 729384d4eb29..4e6cab6aaabc 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -22,7 +22,7 @@
#include "sir_api.h"
#include "sir_params.h"
#include "cfg_api.h"
-
+#include "cfg_ucfg_api.h"
#include "sch_api.h"
#include "utils_api.h"
#include "lim_utils.h"
@@ -2376,6 +2376,7 @@ void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx)
{
/* fetch the sessionEntry based on the sessionId */
tpPESession session;
+ uint32_t val;
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM
host_log_rssi_pkt_type *rssi_log = NULL;
#endif
@@ -2410,11 +2411,18 @@ void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx)
* Failure timeout. Issue MLM auth confirm with timeout reason
* code. Restore default failure timeout
*/
- if (QDF_P2P_CLIENT_MODE == session->pePersona
- && session->defaultAuthFailureTimeout)
- cfg_set_int(mac_ctx,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- session->defaultAuthFailureTimeout);
+ if (QDF_P2P_CLIENT_MODE == session->pePersona &&
+ session->defaultAuthFailureTimeout) {
+ if (cfg_in_range(CFG_AUTH_FAILURE_TIMEOUT,
+ session->defaultAuthFailureTimeout)) {
+ val = session->defaultAuthFailureTimeout;
+ } else {
+ val = cfg_default(CFG_AUTH_FAILURE_TIMEOUT);
+ session->defaultAuthFailureTimeout = val;
+ }
+ mac_ctx->mlme_cfg->timeouts.auth_failure_timeout = val;
+ }
+
lim_restore_from_auth_state(mac_ctx,
eSIR_SME_AUTH_TIMEOUT_RESULT_CODE,
eSIR_MAC_UNSPEC_FAILURE_REASON, session);
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index bc452c87fc38..2e1916cf2c90 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -351,12 +351,6 @@ static void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx,
}
val = sizeof(tSirMacAddr);
sir_copy_mac_addr(assoc_req->peerMacAddr, session_entry->bssId);
- if (wlan_cfg_get_int(mac_ctx, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
- (uint32_t *) &assoc_req->assocFailureTimeout)
- != QDF_STATUS_SUCCESS) {
- /* Could not get AssocFailureTimeout value from CFG.*/
- pe_err("could not retrieve AssocFailureTimeout value");
- }
if (cfg_get_capability_info(mac_ctx, &caps, session_entry)
!= QDF_STATUS_SUCCESS)
@@ -546,12 +540,6 @@ void lim_process_mlm_auth_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg)
auth_req->authType = auth_mode;
/* Update PE session Id */
auth_req->sessionId = auth_cnf->sessionId;
- if (wlan_cfg_get_int(mac_ctx,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- (uint32_t *) &auth_req->authFailureTimeout)
- != QDF_STATUS_SUCCESS) {
- pe_err("Fail:retrieve AuthFailureTimeout");
- }
lim_post_mlm_message(mac_ctx, LIM_MLM_AUTH_REQ,
(uint32_t *) auth_req);
return;
@@ -2353,12 +2341,6 @@ lim_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx,
session_entry->bssId);
pMlmAuthReq->authType = authMode;
- if (wlan_cfg_get_int(mac_ctx,
- WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- (uint32_t *) &pMlmAuthReq->authFailureTimeout)
- != QDF_STATUS_SUCCESS) {
- pe_warn("Fail: retrieve AuthFailureTimeout value");
- }
session_entry->limMlmState = eLIM_MLM_JOINED_STATE;
MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE,
session_entry->peSessionId, eLIM_MLM_JOINED_STATE));
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 9d4e4f05e30e..90301ce767ef 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -1964,11 +1964,6 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
qdf_mem_copy(mlm_reassoc_req->peerMacAddr,
session_entry->limReAssocbssId, sizeof(tSirMacAddr));
- if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- (uint32_t *)&mlm_reassoc_req->reassocFailureTimeout) !=
- QDF_STATUS_SUCCESS)
- pe_err("could not retrieve ReassocFailureTimeout value");
-
if (cfg_get_capability_info(mac_ctx, &caps, session_entry) !=
QDF_STATUS_SUCCESS)
pe_err("could not retrieve Capabilities value");
@@ -3443,12 +3438,8 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
/* start a timer to wait for the response */
if (pSirAddts->timeout)
timeout = pSirAddts->timeout;
- else if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &timeout) !=
- QDF_STATUS_SUCCESS) {
- pe_debug("Unable to get Cfg param %d (Addts Rsp Timeout)",
- WNI_CFG_ADDTS_RSP_TIMEOUT);
- goto send_failure_addts_rsp;
- }
+ else
+ timeout = pMac->mlme_cfg->timeouts.addts_rsp_timeout;
timeout = SYS_MS_TO_TICKS(timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAddtsRspTimer, timeout, 0)
diff --git a/core/mac/src/pe/lim/lim_roam_timer_utils.c b/core/mac/src/pe/lim/lim_roam_timer_utils.c
index a3b1395f8028..73ad9efb07da 100644
--- a/core/mac/src/pe/lim/lim_roam_timer_utils.c
+++ b/core/mac/src/pe/lim/lim_roam_timer_utils.c
@@ -39,11 +39,8 @@ uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx)
{
uint32_t cfg_value;
- if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- &cfg_value) != QDF_STATUS_SUCCESS)
- pe_warn("could not retrieve ReassocFailureTimeout value");
-
- cfg_value = SYS_MS_TO_TICKS(cfg_value);
+ cfg_value = SYS_MS_TO_TICKS(
+ mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout);
/* Create Association failure timer and activate it later */
if (tx_timer_create(mac_ctx,
&mac_ctx->lim.limTimers.gLimReassocFailureTimer,
@@ -111,12 +108,8 @@ void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx,
TX_SUCCESS)
pe_warn("unable to deactivate Reassoc fail timer");
- if (wlan_cfg_get_int(mac_ctx,
- WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- &val) != QDF_STATUS_SUCCESS)
- pe_warn("could not get ReassocFailureTimeout val");
-
- val = SYS_MS_TO_TICKS(val);
+ val = SYS_MS_TO_TICKS(
+ mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout);
if (tx_timer_change
(&mac_ctx->lim.limTimers.gLimReassocFailureTimer, val,
0) != TX_SUCCESS)
diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c
index b22a5a4f0fcb..bdfece57e7e4 100644
--- a/core/mac/src/pe/lim/lim_timer_utils.c
+++ b/core/mac/src/pe/lim/lim_timer_utils.c
@@ -129,11 +129,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
- if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
- &cfgValue) != QDF_STATUS_SUCCESS)
- pe_err("could not retrieve AssocFailureTimeout value");
-
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.assoc_failure_timeout);
/* Create Association failure timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAssocFailureTimer,
"ASSOC FAILURE TIMEOUT",
@@ -143,11 +140,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
- if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &cfgValue)
- != QDF_STATUS_SUCCESS)
- pe_err("Fail to get WNI_CFG_ADDTS_RSP_TIMEOUT");
-
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(pMac->mlme_cfg->timeouts.addts_rsp_timeout);
/* Create Addts response timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAddtsRspTimer,
@@ -159,11 +152,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
- if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- &cfgValue) != QDF_STATUS_SUCCESS)
- pe_err("could not retrieve AuthFailureTimeout value");
-
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.auth_failure_timeout);
/* Create Auth failure timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAuthFailureTimer,
"AUTH FAILURE TIMEOUT",
@@ -174,12 +164,9 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
- if (wlan_cfg_get_int(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
- &cfgValue) != QDF_STATUS_SUCCESS)
- pe_err("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value");
-
/* Change timer to reactivate it in future */
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimProbeAfterHBTimer,
"Probe after Heartbeat TIMEOUT",
lim_timer_handler,
@@ -269,11 +256,8 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
lim_init_pre_auth_timer_table(pMac, &pMac->lim.gLimPreAuthTimerTable);
pe_debug("alloc and init table for preAuth timers");
- if (wlan_cfg_get_int(pMac, WNI_CFG_OLBC_DETECT_TIMEOUT,
- &cfgValue) != QDF_STATUS_SUCCESS)
- pe_err("could not retrieve OLBD detect timeout value");
-
- cfgValue = SYS_MS_TO_TICKS(cfgValue);
+ cfgValue = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.olbc_detect_timeout);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimUpdateOlbcCacheTimer,
"OLBC UPDATE CACHE TIMEOUT",
lim_update_olbc_cache_timer_handler,
@@ -637,15 +621,8 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
pe_err("Unable to deactivate auth failure timer");
}
/* Change timer to reactivate it in future */
- if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
- &val) != QDF_STATUS_SUCCESS) {
- /**
- * Could not get AuthFailureTimeout value
- * from CFG. Log error.
- */
- pe_err("could not retrieve AuthFailureTimeout value");
- }
- val = SYS_MS_TO_TICKS(val);
+ val = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.auth_failure_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAuthFailureTimer,
val, 0) != TX_SUCCESS) {
@@ -693,15 +670,8 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
pe_err("unable to deactivate Association failure timer");
}
/* Change timer to reactivate it in future */
- if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
- &val) != QDF_STATUS_SUCCESS) {
- /**
- * Could not get AssocFailureTimeout value
- * from CFG. Log error.
- */
- pe_err("could not retrieve AssocFailureTimeout value");
- }
- val = SYS_MS_TO_TICKS(val);
+ val = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.assoc_failure_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAssocFailureTimer,
val, 0) != TX_SUCCESS) {
@@ -723,16 +693,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
pe_debug("Deactivated probe after hb timer");
}
- if (wlan_cfg_get_int(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
- &val) != QDF_STATUS_SUCCESS) {
- /**
- * Could not get PROBE_AFTER_HB_FAILURE
- * value from CFG. Log error.
- */
- pe_err("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value");
- }
/* Change timer to reactivate it in future */
- val = SYS_MS_TO_TICKS(val);
+ val = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimProbeAfterHBTimer,
val, 0) != TX_SUCCESS) {
@@ -914,18 +877,8 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
pe_err("unable to deactivate auth response timer");
}
/* Change timer to reactivate it in future */
-
- if (wlan_cfg_get_int
- (pMac, WNI_CFG_AUTHENTICATE_RSP_TIMEOUT,
- &val) != QDF_STATUS_SUCCESS) {
- /**
- * Could not get auth rsp timeout value
- * from CFG. Log error.
- */
- pe_err("could not retrieve auth response timeout value");
- }
-
- val = SYS_MS_TO_TICKS(val);
+ val = SYS_MS_TO_TICKS(
+ pMac->mlme_cfg->timeouts.auth_rsp_timeout);
if (tx_timer_change(&pAuthNode->timer, val, 0) !=
TX_SUCCESS) {
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index 572a757f301c..57d5adfafb59 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -223,7 +223,6 @@ typedef struct sLimMlmJoinCnf {
typedef struct sLimMlmAssocReq {
tSirMacAddr peerMacAddr;
- uint32_t assocFailureTimeout;
uint16_t capabilityInfo;
tSirMacListenInterval listenInterval;
uint8_t sessionId;
@@ -276,7 +275,6 @@ typedef struct sLimMlmAssocInd {
typedef struct sLimMlmReassocReq {
tSirMacAddr peerMacAddr;
- uint32_t reassocFailureTimeout;
uint16_t capabilityInfo;
tSirMacListenInterval listenInterval;
uint8_t sessionId;
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 6b388f82094c..7f0eab1dd975 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -1048,7 +1048,6 @@ typedef struct tagCsrConfigParam {
eCsrPhyMode phyMode;
enum band_info eBand;
uint32_t HeartbeatThresh50;
- uint32_t HeartbeatThresh24;
enum band_info bandCapability; /* indicate hw capability */
eCsrRoamWmmUserModeType WMMSupportMode;
bool Is11eSupportEnabled;
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index d7022ed6e2aa..fe1bb49d1adb 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1336,8 +1336,14 @@ void csr_set_global_cfgs(tpAniSirGlobal pMac)
pMac->roam.configParam.channelBondingMode5GHz))
pMac->mlme_cfg->feature_flags.channel_bonding_mode =
pMac->roam.configParam.channelBondingMode5GHz;
- cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD,
- pMac->roam.configParam.HeartbeatThresh24);
+
+ if (cfg_in_range(CFG_HEART_BEAT_THRESHOLD,
+ pMac->roam.configParam.HeartbeatThresh24))
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ pMac->roam.configParam.HeartbeatThresh24;
+ else
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ cfg_default(CFG_HEART_BEAT_THRESHOLD);
/* Update the operating mode to configured value during
* initialization, So that client can advertise full
@@ -2805,7 +2811,7 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
pMac->roam.configParam.phyMode = pParam->phyMode;
pMac->roam.configParam.shortSlotTime = pParam->shortSlotTime;
pMac->roam.configParam.HeartbeatThresh24 =
- pParam->HeartbeatThresh24;
+ pMac->mlme_cfg->timeouts.heart_beat_threshold;
pMac->roam.configParam.HeartbeatThresh50 =
pParam->HeartbeatThresh50;
pMac->roam.configParam.ProprietaryRatesEnabled =
@@ -3199,7 +3205,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
cfg_params->channelBondingMode5GHz);
pParam->phyMode = cfg_params->phyMode;
pParam->shortSlotTime = cfg_params->shortSlotTime;
- pParam->HeartbeatThresh24 = cfg_params->HeartbeatThresh24;
pParam->HeartbeatThresh50 = cfg_params->HeartbeatThresh50;
pParam->ProprietaryRatesEnabled = cfg_params->ProprietaryRatesEnabled;
pParam->AdHocChannel24 = cfg_params->AdHocChannel24;
@@ -12731,8 +12736,14 @@ void csr_roam_wait_for_key_time_out_handler(void *pv)
*/
sme_debug("Enabling HB timer after WaitKey expiry nHBCount: %d)",
pMac->roam.configParam.HeartbeatThresh24);
- cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD,
- pMac->roam.configParam.HeartbeatThresh24);
+ if (cfg_in_range(CFG_HEART_BEAT_THRESHOLD,
+ pMac->roam.configParam.
+ HeartbeatThresh24))
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ pMac->roam.configParam.HeartbeatThresh24;
+ else
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ cfg_default(CFG_HEART_BEAT_THRESHOLD);
}
sme_debug("SME pre-auth state timeout");
@@ -12815,7 +12826,7 @@ static QDF_STATUS csr_roam_start_wait_for_key_timer(
mac_trace_getcsr_roam_sub_state(
pMac->roam.curSubState[pMac->roam.
WaitForKeyTimerInfo.sessionId]));
- cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, 0);
+ pMac->mlme_cfg->timeouts.heart_beat_threshold = 0;
}
sme_debug("csrScanStartWaitForKeyTimer");
status = qdf_mc_timer_start(&pMac->roam.hTimerWaitForKey,
@@ -12846,8 +12857,13 @@ QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac)
*/
sme_debug("Enabling HB timer after WaitKey stop nHBCount: %d",
pMac->roam.configParam.HeartbeatThresh24);
- cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD,
- pMac->roam.configParam.HeartbeatThresh24);
+ if (cfg_in_range(CFG_HEART_BEAT_THRESHOLD,
+ pMac->roam.configParam.HeartbeatThresh24))
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ pMac->roam.configParam.HeartbeatThresh24;
+ else
+ pMac->mlme_cfg->timeouts.heart_beat_threshold =
+ cfg_default(CFG_HEART_BEAT_THRESHOLD);
}
return qdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey);
}
@@ -18211,16 +18227,8 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
mac_ctx->roam.configParam.roam_trigger_reason_bitmask;
req_buf->roam_force_rssi_trigger =
mac_ctx->roam.configParam.roam_force_rssi_trigger;
-
- if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT,
- (uint32_t *) &req_buf->ReassocFailureTimeout)
- != QDF_STATUS_SUCCESS) {
- sme_err(
- "could not retrieve ReassocFailureTimeout value");
- req_buf->ReassocFailureTimeout =
- DEFAULT_REASSOC_FAILURE_TIMEOUT;
- }
-
+ req_buf->ReassocFailureTimeout =
+ mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout;
csr_update_roam_scan_ese_params(req_buf, session);
req_buf->AcUapsd.acbe_uapsd = SIR_UAPSD_GET(ACBE, session->uapsd_mask);
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 3a0d8fed86d1..ca2ff497b8db 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -596,39 +596,6 @@ wma_get_go_probe_timeout(struct sAniSirGlobal *mac,
}
#endif
-/**
- * wma_get_sap_probe_timeout() - get sap probe timeout
- * @mac: UMAC handler
- * @max_inactive_time: return max inactive time
- * @max_unresponsive_time: return max unresponsive time
- *
- * Return: none
- */
-static inline void
-wma_get_sap_probe_timeout(struct sAniSirGlobal *mac,
- uint32_t *max_inactive_time,
- uint32_t *max_unresponsive_time)
-{
- uint32_t keep_alive;
- QDF_STATUS status;
-
- status = wlan_cfg_get_int(mac, WNI_CFG_AP_LINK_MONITOR_TIMEOUT,
- max_inactive_time);
- if (QDF_IS_STATUS_ERROR(status)) {
- WMA_LOGE("Failed to read sap monitor period");
- *max_inactive_time = WMA_LINK_MONITOR_DEFAULT_TIME_SECS;
- }
-
- status = wlan_cfg_get_int(mac, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT,
- &keep_alive);
- if (QDF_IS_STATUS_ERROR(status)) {
- WMA_LOGE("Failed to read sap keep alive");
- keep_alive = WMA_KEEP_ALIVE_DEFAULT_TIME_SECS;
- }
-
- *max_unresponsive_time = *max_inactive_time + keep_alive;
-}
-
/**
* wma_get_link_probe_timeout() - get link timeout based on sub type
* @mac: UMAC handler
@@ -644,12 +611,15 @@ wma_get_link_probe_timeout(struct sAniSirGlobal *mac,
uint32_t *max_inactive_time,
uint32_t *max_unresponsive_time)
{
- if (sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO)
+ if (sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO) {
wma_get_go_probe_timeout(mac, max_inactive_time,
max_unresponsive_time);
- else
- wma_get_sap_probe_timeout(mac, max_inactive_time,
- max_unresponsive_time);
+ } else {
+ *max_inactive_time =
+ mac->mlme_cfg->timeouts.ap_link_monitor_timeout;
+ *max_unresponsive_time = *max_inactive_time +
+ mac->mlme_cfg->timeouts.ap_keep_alive_timeout;
+ }
}
/**
diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c
index 21ba486c3c42..5cde71783b7f 100644
--- a/core/wma/src/wma_power.c
+++ b/core/wma/src/wma_power.c
@@ -570,14 +570,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
return QDF_STATUS_E_NOMEM;
}
- /* Set Tx/Rx Data InActivity Timeout */
- if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
- &cfg_data_val) != QDF_STATUS_SUCCESS) {
- QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
- "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
- cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME;
- }
- inactivity_time = (uint32_t) cfg_data_val;
+ inactivity_time = mac->mlme_cfg->timeouts.ps_data_inactivity_timeout;
if (enable) {
/* override normal configuration and force station asleep */