prima: Transmit tdls mgmt frames only if STA is in authenticated state
Before transmitting the tdls mgmt frames the STA should be
connected to AP and it should be in authenticated state.
Change-Id: Id79d4e6ad55a6b80e2fac2369f48bedf6551bcd6
CRs-Fixed: 893784
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 6869885..b036882 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -15057,7 +15057,6 @@
#endif
#endif
{
-
hdd_adapter_t *pAdapter;
hdd_context_t *pHddCtx;
VOS_STATUS status;
@@ -15069,6 +15068,7 @@
u32 peer_capability = 0;
#endif
tANI_U16 numCurrTdlsPeers;
+ hdd_station_ctx_t *pHddStaCtx = NULL;
pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
if (NULL == pAdapter)
@@ -15080,6 +15080,7 @@
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
pAdapter->sessionId, action_code));
+
pHddCtx = wiphy_priv(wiphy);
if (NULL == pHddCtx || NULL == pHddCtx->cfg_ini)
{
@@ -15087,6 +15088,7 @@
"Invalid arguments");
return -EINVAL;
}
+
if (pHddCtx->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -15097,12 +15099,14 @@
eTDLS_LINK_UNSPECIFIED);
return -EBUSY;
}
+
if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(pHddCtx))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Unloading/Loading in Progress. Ignore!!!", __func__);
return -EAGAIN;
}
+
if (eTDLS_SUPPORT_NOT_ENABLED == pHddCtx->tdls_mode)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -15112,6 +15116,29 @@
return -ENOTSUPP;
}
+ pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+
+ if( NULL == pHddStaCtx )
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: HDD station context NULL ",__func__);
+ return -EINVAL;
+ }
+
+ /* STA should be connected and authenticated
+ * before sending any TDLS frames
+ */
+ if ((eConnectionState_Associated != pHddStaCtx->conn_info.connState) ||
+ (FALSE == pHddStaCtx->conn_info.uIsAuthenticated))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "STA is not connected or unauthenticated. "
+ "connState %u, uIsAuthenticated %u",
+ pHddStaCtx->conn_info.connState,
+ pHddStaCtx->conn_info.uIsAuthenticated);
+ return -EAGAIN;
+ }
+
/* other than teardown frame, other mgmt frames are not sent if disabled */
if (SIR_MAC_TDLS_TEARDOWN != action_code)
{
@@ -15123,7 +15150,7 @@
" TDLS mode is disabled. action %d declined.",
__func__, MAC_ADDR_ARRAY(peer), action_code);
- return -ENOTSUPP;
+ return -ENOTSUPP;
}
if (vos_max_concurrent_connections_reached())
@@ -15253,8 +15280,10 @@
pAdapter->mgmtTxCompletionStatus = TDLS_CTX_MAGIC;
INIT_COMPLETION(pAdapter->tdls_mgmt_comp);
- status = sme_SendTdlsMgmtFrame(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
- peer, action_code, dialog_token, status_code, peer_capability, (tANI_U8 *)buf, len, responder);
+ status = sme_SendTdlsMgmtFrame(WLAN_HDD_GET_HAL_CTX(pAdapter),
+ pAdapter->sessionId, peer, action_code, dialog_token,
+ status_code, peer_capability, (tANI_U8 *)buf, len,
+ responder);
if (VOS_STATUS_SUCCESS != status)
{
@@ -15265,6 +15294,21 @@
goto tx_failed;
}
+ if ((SIR_MAC_TDLS_DIS_REQ == action_code) ||
+ (SIR_MAC_TDLS_DIS_RSP == action_code))
+ {
+ /* for DIS_REQ/DIS_RSP, supplicant don't consider the return status.
+ * So we no need to wait for tdls_mgmt_comp for sending ack status.
+ */
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: tx done for frm %u", __func__, action_code);
+ return 0;
+ }
+
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Wait for tdls_mgmt_comp. Timeout %u ms", __func__,
+ WAIT_TIME_TDLS_MGMT);
+
rc = wait_for_completion_interruptible_timeout(&pAdapter->tdls_mgmt_comp,
msecs_to_jiffies(WAIT_TIME_TDLS_MGMT));
@@ -15285,6 +15329,12 @@
ret = -EINVAL;
goto tx_failed;
}
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Mgmt Tx Completion status %ld TxCompletion %u",
+ __func__, rc, pAdapter->mgmtTxCompletionStatus);
+ }
if (max_sta_failed)
{