wlan: Teardown TDLS link on TDLS link establish request failure
Currently, Failure response from FW for link establish request is
not honoured in HDD and thus proceeding to establish TDLS link.
Fix is to honour the failure response from FW and return error
to supplicant.
Change-Id: I07e36a36b3218517e61dc9c5827e6f8ddd0a0dbf
CRs-Fixed: 951780
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 02f9b52..84f9fbd 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3049,8 +3049,20 @@
{
if (eSIR_SME_SUCCESS != pRoamInfo->statusCode)
{
+ hddTdlsPeer_t *curr_peer;
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: Link Establish Request failed. %d", __func__, pRoamInfo->statusCode);
+
+ mutex_lock(&pHddCtx->tdls_lock);
+ curr_peer = wlan_hdd_tdls_find_peer(pAdapter,
+ pRoamInfo->peerMac, FALSE);
+ if (curr_peer)
+ curr_peer->link_status = eTDLS_LINK_TEARING;
+ else
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s %d curr_peer is Null",__func__,__LINE__);
+ mutex_unlock(&pHddCtx->tdls_lock);
}
complete(&pAdapter->tdls_link_establish_req_comp);
break;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index ec8a13e..5fac51a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -17957,7 +17957,22 @@
ret = wait_for_completion_interruptible_timeout(
&pAdapter->tdls_link_establish_req_comp,
msecs_to_jiffies(WAIT_TIME_TDLS_LINK_ESTABLISH_REQ));
- if (ret <= 0)
+
+ mutex_lock(&pHddCtx->tdls_lock);
+ pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, FALSE);
+ if ( NULL == pTdlsPeer ) {
+ mutex_unlock(&pHddCtx->tdls_lock);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s %d: " MAC_ADDRESS_STR
+ " (oper %d) peer got freed in other context. ignored",
+ __func__, __LINE__, MAC_ADDR_ARRAY(peer),
+ (int)oper);
+ return -EINVAL;
+ }
+ peer_status = pTdlsPeer->link_status;
+ mutex_unlock(&pHddCtx->tdls_lock);
+
+ if (ret <= 0 || (peer_status == eTDLS_LINK_TEARING))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
FL("Link Establish Request Failed Status %ld"),
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 105f642..5ff54cb 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -4327,6 +4327,7 @@
tANI_U16 transactionId; // Transaction ID for cmd
tSirResultCodes statusCode;
tSirMacAddr peerMac;
+ tANI_U16 sta_idx;
}tSirTdlsLinkEstablishReqRsp, *tpSirTdlsLinkEstablishReqRsp;
/* TDLS Request struct SME-->PE */
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index faffd1b..9717480 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -86,6 +86,8 @@
#define SIZE_OF_FIXED_PARAM 12
#endif
+#define CHECK_BIT(value, mask) ((value) & (1 << (mask)))
+
void limLogSessionStates(tpAniSirGlobal pMac);
/** -------------------------------------------------------------
@@ -2178,6 +2180,8 @@
{
tpPESession psessionEntry;
tANI_U8 sessionId;
+ tDphHashNode *pStaDs;
+ int i, aid;
tTdlsLinkEstablishParams *pTdlsLinkEstablishParams;
pTdlsLinkEstablishParams = (tTdlsLinkEstablishParams*) limMsg->bodyptr;
@@ -2197,10 +2201,26 @@
}
else
{
+ for (i = 0;
+ i < sizeof(psessionEntry->peerAIDBitmap)/sizeof(tANI_U32);
+ i++) {
+ for (aid = 0; aid < (sizeof(tANI_U32) << 3); aid++) {
+ if (CHECK_BIT(psessionEntry->peerAIDBitmap[i], aid)) {
+ pStaDs = dphGetHashEntry(pMac,
+ (aid + i*(sizeof(tANI_U32) << 3)),
+ &psessionEntry->dph.dphHashTable);
+ if ((NULL != pStaDs) &&
+ (pTdlsLinkEstablishParams->staIdx ==
+ pStaDs->staIndex))
+ goto send_link_resp;
+ }
+ }
+ }
+send_link_resp:
limSendSmeTdlsLinkEstablishReqRsp(pMac,
psessionEntry->smeSessionId,
- NULL,
- NULL,
+ pStaDs->staAddr,
+ pStaDs,
pTdlsLinkEstablishParams->status) ;
}
vos_mem_free((v_VOID_t *)(limMsg->bodyptr));
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 61bfac4..b341efa 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3056,12 +3056,18 @@
limLog(pMac, LOGE, FL("Failed to allocate memory"));
return ;
}
+
+ vos_mem_zero(pTdlsLinkEstablishReqRsp, sizeof(tSirTdlsLinkEstablishReqRsp));
+
pTdlsLinkEstablishReqRsp->statusCode = status ;
- if ( peerMac )
+ if (pStaDs && peerMac)
{
vos_mem_copy(pTdlsLinkEstablishReqRsp->peerMac, peerMac, sizeof(tSirMacAddr));
+ pTdlsLinkEstablishReqRsp->sta_idx = pStaDs->staIndex;
}
+
pTdlsLinkEstablishReqRsp->sessionId = sessionId;
+
mmhMsg.type = eWNI_SME_TDLS_LINK_ESTABLISH_RSP ;
mmhMsg.bodyptr = pTdlsLinkEstablishReqRsp;
mmhMsg.bodyval = 0;
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index a5504d3..d0da423 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -945,6 +945,11 @@
roamInfo.staId = delStaRsp->staId ;
roamInfo.statusCode = delStaRsp->statusCode ;
#endif
+ vos_mem_copy(&roamInfo.peerMac, linkEstablishReqRsp->peerMac,
+ sizeof(tSirMacAddr)) ;
+ roamInfo.staId = (tANI_U8)linkEstablishReqRsp->sta_idx;
+ roamInfo.statusCode = linkEstablishReqRsp->statusCode;
+
csrRoamCallCallback(pMac, linkEstablishReqRsp->sessionId, &roamInfo, 0,
eCSR_ROAM_TDLS_STATUS_UPDATE,
eCSR_ROAM_RESULT_LINK_ESTABLISH_REQ_RSP);