summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/cds/src/cds_concurrency.c6
-rw-r--r--core/hdd/inc/wlan_hdd_main.h2
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c10
-rw-r--r--core/hdd/src/wlan_hdd_hostapd.c11
-rw-r--r--core/hdd/src/wlan_hdd_main.c10
-rw-r--r--core/sap/src/sap_fsm.c4
-rw-r--r--core/sme/inc/sme_api.h3
-rw-r--r--core/sme/src/common/sme_api.c2
-rw-r--r--core/sme/src/csr/csr_inside_api.h11
9 files changed, 30 insertions, 29 deletions
diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c
index 42d52749785d..02d8f8c304ea 100644
--- a/core/cds/src/cds_concurrency.c
+++ b/core/cds/src/cds_concurrency.c
@@ -7835,8 +7835,8 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter)
if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) {
qdf_status =
qdf_wait_single_event(&hostapd_state->
- qdf_stop_bss_event,
- BSS_WAIT_TIMEOUT);
+ qdf_stop_bss_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
cds_err("SAP Stop Failed");
@@ -7868,7 +7868,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter)
cds_info("Waiting for SAP to start");
qdf_status =
qdf_wait_single_event(&hostapd_state->qdf_event,
- BSS_WAIT_TIMEOUT);
+ SME_CMD_TIMEOUT_VALUE);
wlansap_reset_sap_config_add_ie(sap_config,
eUPDATE_IE_ALL);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 8901efe9e52c..19416786fc66 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -260,8 +260,6 @@
#define NET_NAME_UNKNOWN 0
#endif
-#define BSS_WAIT_TIMEOUT 10000
-
#define PRE_CAC_SSID "pre_cac_ssid"
/* session ID invalid */
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 37dfff98e66f..f995def1716e 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -13657,8 +13657,9 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
isDeauthInProgress = true;
qdf_status =
qdf_wait_single_event(
- &hapd_state->qdf_sta_disassoc_event,
- 1000);
+ &hapd_state->
+ qdf_sta_disassoc_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(
qdf_status))
hdd_err("Deauth wait time expired");
@@ -13721,8 +13722,9 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
return -ENOENT;
} else {
qdf_status = qdf_wait_single_event(
- &hapd_state->qdf_sta_disassoc_event,
- 1000);
+ &hapd_state->
+ qdf_sta_disassoc_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
hdd_err("Deauth wait time expired");
}
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 35419fadfdd6..3e9ee1d24b4f 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -4774,8 +4774,8 @@ __iw_softap_stopbss(struct net_device *dev,
if (QDF_IS_STATUS_SUCCESS(status)) {
qdf_status =
qdf_wait_single_event(&pHostapdState->
- qdf_stop_bss_event,
- 10000);
+ qdf_stop_bss_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("wait for single_event failed!!");
@@ -7702,7 +7702,8 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
hdd_notice("Waiting for Scan to complete(auto mode) and BSS to start");
- qdf_status = qdf_wait_single_event(&pHostapdState->qdf_event, 10000);
+ qdf_status = qdf_wait_single_event(&pHostapdState->qdf_event,
+ SME_CMD_TIMEOUT_VALUE);
wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL);
@@ -7878,8 +7879,8 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
if (QDF_IS_STATUS_SUCCESS(status)) {
qdf_status =
qdf_wait_single_event(&pHostapdState->
- qdf_stop_bss_event,
- 10000);
+ qdf_stop_bss_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("HDD qdf wait for single_event failed!!");
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 698fb016d46f..56c9454a23f1 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3656,8 +3656,8 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
qdf_stop_bss_event);
qdf_status =
qdf_wait_single_event(&hostapd_state->
- qdf_stop_bss_event,
- BSS_WAIT_TIMEOUT);
+ qdf_stop_bss_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("failure waiting for wlansap_stop_bss %d",
@@ -9001,8 +9001,8 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx->
sapContext)) {
qdf_status = qdf_wait_single_event(&hostapd_state->
- qdf_stop_bss_event,
- BSS_WAIT_TIMEOUT);
+ qdf_stop_bss_event,
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
mutex_unlock(&hdd_ctx->sap_lock);
hdd_err("SAP Stop Failed");
@@ -9073,7 +9073,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
hdd_info("Waiting for SAP to start");
qdf_status = qdf_wait_single_event(&hostapd_state->qdf_event,
- BSS_WAIT_TIMEOUT);
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("SAP Start failed");
goto end;
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index dbbec9fa0a9a..6f4ab26fe79a 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -2497,8 +2497,6 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
*
* Return: QDF_STATUS
*/
-
-#define SAP_OPEN_SESSION_TIMEOUT 30000
QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext,
uint32_t *session_id)
{
@@ -2535,7 +2533,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext,
}
status = qdf_wait_single_event(&sapContext->sap_session_opened_evt,
- SAP_OPEN_SESSION_TIMEOUT);
+ SME_CMD_TIMEOUT_VALUE);
if (!QDF_IS_STATUS_SUCCESS(status)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 4d2292a3acab..121d5de9e537 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -80,6 +80,9 @@
#define ROAM_CONFIG_TO_SME_CONFIG 2
#define NUM_OF_BANDS 2
+
+#define SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE (30*1000)
+#define SME_CMD_TIMEOUT_VALUE (SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE + 1000)
/*--------------------------------------------------------------------------
Type declarations
------------------------------------------------------------------------*/
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 33240f827d97..d746f633bc0f 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -385,7 +385,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac)
pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL;
} else {
pMac->sme.smeCmdActiveList.cmdTimeoutDuration =
- CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE;
+ SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE;
}
}
diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h
index 28a14b97a777..08bed5acbcbd 100644
--- a/core/sme/src/csr/csr_inside_api.h
+++ b/core/sme/src/csr/csr_inside_api.h
@@ -96,17 +96,16 @@
#define CSR_ROAMING_DFS_CHANNEL_ENABLED_NORMAL (1)
#define CSR_ROAMING_DFS_CHANNEL_ENABLED_ACTIVE (2)
-/* ***************************************************************************
- * The MAX BSSID Count should be lower than the command timeout value and it
- * can be of a fraction of 3/4 of the total command timeout value.
- * ***************************************************************************/
-#define CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE (1000*30)
#ifdef QCA_WIFI_3_0_EMU
#define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30*20)
#else
#define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30)
#endif
-#define CSR_MAX_BSSID_COUNT ((CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE/4000) * 3)
+/* ***************************************************************************
+ * The MAX BSSID Count should be lower than the command timeout value and it
+ * can be of a fraction of 3/4 of the total command timeout value.
+ * ***************************************************************************/
+#define CSR_MAX_BSSID_COUNT ((SME_ACTIVE_LIST_CMD_TIMEOUT_VALUE/4000) * 3)
#define CSR_CUSTOM_CONC_GO_BI 100
typedef enum {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-01 13:47:06 +0000