|
@@ -623,33 +623,42 @@ bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1,
|
|
|
return fEqual;
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_connected_ibss(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
+static bool csr_is_conn_state(tpAniSirGlobal mac_ctx, uint32_t session_id,
|
|
|
+ eCsrConnectState state)
|
|
|
{
|
|
|
- return eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState;
|
|
|
+ QDF_BUG(session_id < CSR_ROAM_SESSION_MAX);
|
|
|
+ if (session_id >= CSR_ROAM_SESSION_MAX)
|
|
|
+ return false;
|
|
|
+
|
|
|
+ return mac_ctx->roam.roamSession[session_id].connectState == state;
|
|
|
+}
|
|
|
+
|
|
|
+bool csr_is_conn_state_connected_ibss(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
+{
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED);
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_disconnected_ibss(tpAniSirGlobal pMac,
|
|
|
- uint32_t sessionId)
|
|
|
+bool csr_is_conn_state_disconnected_ibss(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
{
|
|
|
- return eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState;
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED);
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_connected_infra(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
+bool csr_is_conn_state_connected_infra(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
{
|
|
|
- return eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState;
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED);
|
|
|
}
|
|
|
|
|
|
bool csr_is_conn_state_connected(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
{
|
|
|
- if (csr_is_conn_state_connected_ibss(pMac, sessionId)
|
|
|
- || csr_is_conn_state_connected_infra(pMac, sessionId)
|
|
|
- || csr_is_conn_state_connected_wds(pMac, sessionId))
|
|
|
- return true;
|
|
|
- else
|
|
|
- return false;
|
|
|
+ return csr_is_conn_state_connected_ibss(pMac, sessionId) ||
|
|
|
+ csr_is_conn_state_connected_infra(pMac, sessionId) ||
|
|
|
+ csr_is_conn_state_connected_wds(pMac, sessionId);
|
|
|
}
|
|
|
|
|
|
bool csr_is_conn_state_infra(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
@@ -663,25 +672,27 @@ bool csr_is_conn_state_ibss(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
csr_is_conn_state_disconnected_ibss(pMac, sessionId);
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_connected_wds(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
+bool csr_is_conn_state_connected_wds(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
{
|
|
|
- return eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState;
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED);
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal pMac,
|
|
|
- uint32_t sessionId)
|
|
|
+bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
{
|
|
|
- return (eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState) ||
|
|
|
- (eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState);
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED) ||
|
|
|
+ csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED);
|
|
|
}
|
|
|
|
|
|
-bool csr_is_conn_state_disconnected_wds(tpAniSirGlobal pMac, uint32_t sessionId)
|
|
|
+bool csr_is_conn_state_disconnected_wds(tpAniSirGlobal mac_ctx,
|
|
|
+ uint32_t session_id)
|
|
|
{
|
|
|
- return eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED ==
|
|
|
- pMac->roam.roamSession[sessionId].connectState;
|
|
|
+ return csr_is_conn_state(mac_ctx, session_id,
|
|
|
+ eCSR_ASSOC_STATE_TYPE_WDS_DISCONNECTED);
|
|
|
}
|
|
|
|
|
|
bool csr_is_conn_state_wds(tpAniSirGlobal pMac, uint32_t sessionId)
|