TDLS: Revert "TDLS: Disappearing AP Trick Implementation "
This commit reverts Disappearing AP Trick requirement
Change-Id: Ibe0b575206c2b4e6e5253c13f53efeb77bfefdc5
CRs-fixed: 546261
diff --git a/CORE/HDD/inc/wlan_hdd_tdls.h b/CORE/HDD/inc/wlan_hdd_tdls.h
index d067bca..04c2c79 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -140,9 +140,6 @@
struct _hddTdlsPeer_t *curr_candidate;
struct work_struct implicit_setup;
v_U32_t magic;
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- v_BOOL_t defer_link_lost_indication;
-#endif
} tdlsCtx_t;
typedef struct _hddTdlsPeer_t {
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 06d89fa..2572bf1 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2136,9 +2136,6 @@
eCsrRoamResult roamResult)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
-#endif
eHalStatus status = eHAL_STATUS_FAILURE ;
tANI_U8 staIdx;
@@ -2151,9 +2148,6 @@
roamResult == eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND? "DEL_ALL_TDLS_PEER_IND" :
roamResult == eCSR_ROAM_RESULT_UPDATE_TDLS_PEER? "UPDATE_TDLS_PEER" :
roamResult == eCSR_ROAM_RESULT_LINK_ESTABLISH_REQ_RSP? "LINK_ESTABLISH_REQ_RSP" :
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- roamResult == eCSR_ROAM_RESULT_TDLS_DISAPPEAR_AP_IND? "DISAPPEAR_AP_DEREG_STA" :
-#endif
"UNKNOWN",
pRoamInfo->staId,
pRoamInfo->peerMac[0],
@@ -2285,18 +2279,6 @@
complete(&pAdapter->tdls_del_station_comp);
}
break ;
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- case eCSR_ROAM_RESULT_TDLS_DISAPPEAR_AP_IND:
- {
- if (NULL == pHddTdlsCtx)
- return status;
-
- pHddTdlsCtx->defer_link_lost_indication = TRUE;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- ("HDD: DISAPPEAR_AP_IND sta id %d"), pRoamInfo->staId) ;
- }
- break;
-#endif
case eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND:
{
hddTdlsPeer_t *curr_peer;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 7657f3d..6d80f66 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7740,10 +7740,6 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
int status;
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- tANI_U8 staIdx;
-#endif
#ifdef WLAN_FEATURE_TDLS_DEBUG
const char *tdls_oper_str[]= {
"NL80211_TDLS_DISCOVERY_REQ",
@@ -7909,23 +7905,6 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: TDLS Peer Station doesn't exist.", __func__);
}
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- if (pHddTdlsCtx->defer_link_lost_indication)
- {
- if (( TRUE == pHddCtx->cfg_ini->fEnableTDLSOxygenSupport ) &&
- (wlan_hdd_tdlsConnectedPeers(pAdapter) == 0))
- {
- status = wlan_hdd_disconnect(pAdapter, eCSR_DISCONNECT_REASON_UNSPECIFIED);
- if ( 0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s wlan_hdd_disconnect failure, returned %d \n",
- __func__, (int)status );
- return -EINVAL;
- }
- }
- }
-#endif
}
break;
case NL80211_TDLS_TEARDOWN:
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index feb28ad..176f27a 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -1438,9 +1438,6 @@
pHddTdlsCtx->threshold_config.tx_period_t,
pHddTdlsCtx->threshold_config.discovery_period_t);
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- pHddTdlsCtx->defer_link_lost_indication = FALSE;
-#endif
if (eTDLS_SUPPORT_ENABLED == pHddCtx->tdls_mode)
{
wlan_hdd_tdls_peer_reset_discovery_processed(pHddTdlsCtx);
@@ -1477,9 +1474,6 @@
mutex_unlock(&tdls_lock);
return;
}
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- pHddTdlsCtx->defer_link_lost_indication = FALSE;
-#endif
pHddTdlsCtx->discovery_sent_cnt = 0;
wlan_hdd_tdls_check_power_save_prohibited(pHddTdlsCtx->pAdapter);
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index e909a2e..e12e10c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -4002,16 +4002,6 @@
tANI_U16 length;
tANI_U8 sessionId; // Session ID
} tSirTdlsDelAllPeerInd, *tpSirTdlsDelAllPeerInd;
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
-typedef struct sSirTdlsDisappearAPInd
-{
- tANI_U16 messageType;
- tANI_U16 length;
- tANI_U8 sessionId; // Session ID
- tANI_U16 staId;
- tSirMacAddr staAddr;
-} tSirTdlsDisappearAPInd, *tpSirTdlsDisappearAPInd;
-#endif
typedef struct sSirMgmtTxCompletionInd
{
tANI_U16 messageType;
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 4c4a709..f4ba91a 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -345,9 +345,6 @@
eWNI_SME_TDLS_DEL_STA_IND,
eWNI_SME_TDLS_DEL_ALL_PEER_IND,
eWNI_SME_MGMT_FRM_TX_COMPLETION_IND,
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- eWNI_SME_TDLS_AP_DISAPPEAR_IND,
-#endif
eWNI_SME_TDLS_LINK_ESTABLISH_REQ,
eWNI_SME_TDLS_LINK_ESTABLISH_RSP,
#endif
diff --git a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
index 6a12302..f0a2192 100644
--- a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
+++ b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
@@ -191,14 +191,6 @@
mlmDeauthInd.deauthTrigger = pStaDs->mlmStaContext.cleanupTrigger;
#ifdef FEATURE_WLAN_TDLS
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- if ((TRUE == pMac->lim.gLimTDLSOxygenSupport) &&
- (limGetTDLSPeerCount(pMac, psessionEntry) != 0)) {
- limTDLSDisappearAPTrickInd(pMac, pStaDs, psessionEntry);
- vos_mem_free(pMsg);
- return ;
- }
-#endif
/* Delete all TDLS peers connected before leaving BSS*/
limDeleteTDLSPeers(pMac, psessionEntry);
#endif
@@ -380,13 +372,6 @@
tLimMlmDeauthInd mlmDeauthInd;
#ifdef FEATURE_WLAN_TDLS
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- if ((TRUE == pMac->lim.gLimTDLSOxygenSupport) &&
- (limGetTDLSPeerCount(pMac, psessionEntry) != 0)) {
- limTDLSDisappearAPTrickInd(pMac, pStaDs, psessionEntry);
- return;
- }
-#endif
/* Delete all TDLS peers connected before leaving BSS*/
limDeleteTDLSPeers(pMac, psessionEntry);
#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
index 76dfc0c..6a4ff21 100644
--- a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
@@ -361,13 +361,6 @@
}
else
{
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- if ((TRUE == pMac->lim.gLimTDLSOxygenSupport) &&
- (limGetTDLSPeerCount(pMac, psessionEntry) != 0)) {
- limTDLSDisappearAPTrickInd(pMac, pStaDs, psessionEntry);
- return;
- }
-#endif
limDeleteTDLSPeers(pMac, psessionEntry);
#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index 52d2d30..d78c25e 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -321,13 +321,6 @@
limRestorePreReassocState(pMac,eSIR_SME_REASSOC_REFUSED, reasonCode,psessionEntry);
return;
}
-#if defined(FEATURE_WLAN_TDLS) && defined(FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP)
- if ((TRUE == pMac->lim.gLimTDLSOxygenSupport) &&
- (limGetTDLSPeerCount(pMac, psessionEntry) != 0)) {
- limTDLSDisappearAPTrickInd(pMac, pStaDs, psessionEntry);
- return;
- }
-#endif
limPostSmeMessage(pMac, LIM_MLM_DISASSOC_IND,
(tANI_U32 *) &mlmDisassocInd);
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 6edd0ac..85d38ee 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1620,26 +1620,6 @@
}
else
{
-#if defined(FEATURE_WLAN_TDLS) && defined(FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP)
- tpPESession psessionEntry = &pMac->lim.gpSession[0];
- for (i=0; i < pMac->lim.maxBssId; i++)
- {
- psessionEntry = &pMac->lim.gpSession[i];
- if ((psessionEntry != NULL) && (psessionEntry->valid) &&
- ((psessionEntry->pePersona == VOS_P2P_CLIENT_MODE) ||
- (psessionEntry->pePersona == VOS_STA_MODE)))
- {
- if ((TRUE == pMac->lim.gLimTDLSOxygenSupport) &&
- (limGetTDLSPeerCount(pMac, psessionEntry) != 0)) {
- if (limMsg->bodyptr) {
- vos_mem_free(limMsg->bodyptr);
- limMsg->bodyptr = NULL;
- }
- return;
- }
- }
- }
-#endif
if (NULL == limMsg->bodyptr)
{
limHandleHeartBeatTimeout(pMac);
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index df427bd..60fb301 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -5625,53 +5625,4 @@
return eSIR_SUCCESS;
}
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
-/* Get the number of TDLS peer connected in the BSS */
-int limGetTDLSPeerCount(tpAniSirGlobal pMac, tpPESession psessionEntry)
-{
- int i,tdlsPeerCount = 0;
- /* Check all the set bit in peerAIDBitmap and return the number of TDLS peer counts */
- for (i = 0; i < sizeof(psessionEntry->peerAIDBitmap)/sizeof(tANI_U32); i++)
- {
- tANI_U32 bitmap;
- bitmap = psessionEntry->peerAIDBitmap[i];
- while (bitmap)
- {
- tdlsPeerCount++;
- bitmap >>= 1;
- }
- }
- return tdlsPeerCount;
-}
-
-void limTDLSDisappearAPTrickInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry)
-{
- tSirMsgQ mmhMsg;
- tSirTdlsDisappearAPInd *pSirTdlsDisappearAPInd;
-
- pSirTdlsDisappearAPInd = vos_mem_malloc(sizeof(tSirTdlsDisappearAPInd));
- if ( NULL == pSirTdlsDisappearAPInd )
- {
- limLog(pMac, LOGP, FL("AllocateMemory failed for eWNI_SME_TDLS_DEL_ALL_PEER_IND"));
- return;
- }
-
- //messageType
- pSirTdlsDisappearAPInd->messageType = eWNI_SME_TDLS_AP_DISAPPEAR_IND;
- pSirTdlsDisappearAPInd->length = sizeof(tSirTdlsDisappearAPInd);
-
- //sessionId
- pSirTdlsDisappearAPInd->sessionId = psessionEntry->smeSessionId;
- pSirTdlsDisappearAPInd->staId = pStaDs->staIndex ;
- vos_mem_copy( pSirTdlsDisappearAPInd->staAddr,
- (tANI_U8 *) pStaDs->staAddr, sizeof(tSirMacAddr));
-
- mmhMsg.type = eWNI_SME_TDLS_AP_DISAPPEAR_IND;
- mmhMsg.bodyptr = pSirTdlsDisappearAPInd;
- mmhMsg.bodyval = 0;
-
-
- limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
-}
-#endif
#endif
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 50a21d7..7ab0ef0 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -748,10 +748,6 @@
tpPESession psessionEntry,
tANI_U32 txCompleteStatus);
tSirRetStatus limDeleteTDLSPeers(tpAniSirGlobal pMac, tpPESession psessionEntry);
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
-void limTDLSDisappearAPTrickInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry);
-int limGetTDLSPeerCount(tpAniSirGlobal pMac, tpPESession psessionEntry);
-#endif
eHalStatus limProcessTdlsAddStaRsp(tpAniSirGlobal pMac, void *msg, tpPESession);
tSirRetStatus limSendTdlsTeardownFrame(tpAniSirGlobal pMac,
tSirMacAddr peerMac, tANI_U16 reason, tANI_U8 responder, tpPESession psessionEntry,
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 2fac39c..f58b26a 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -549,9 +549,6 @@
eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND,
eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND,
eCSR_ROAM_RESULT_LINK_ESTABLISH_REQ_RSP,
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- eCSR_ROAM_RESULT_TDLS_DISAPPEAR_AP_IND,
-#endif
#endif
}eCsrRoamResult;
diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c
index 44a8404..8e99334 100644
--- a/CORE/SME/src/csr/csrTdlsProcess.c
+++ b/CORE/SME/src/csr/csrTdlsProcess.c
@@ -1055,19 +1055,6 @@
eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND);
break ;
}
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- case eWNI_SME_TDLS_AP_DISAPPEAR_IND:
- {
- tpSirTdlsDisappearAPInd pSirTdlsDisappearAPInd = (tpSirTdlsDisappearAPInd) pMsgBuf;
- tCsrRoamInfo roamInfo = {0} ;
- roamInfo.staId = pSirTdlsDisappearAPInd->staId ;
- /* Sending the TEARDOWN indication to HDD. */
- csrRoamCallCallback(pMac, pSirTdlsDisappearAPInd->sessionId, &roamInfo, 0,
- eCSR_ROAM_TDLS_STATUS_UPDATE,
- eCSR_ROAM_RESULT_TDLS_DISAPPEAR_AP_IND);
- break ;
- }
-#endif
case eWNI_SME_TDLS_DEL_ALL_PEER_IND:
{
tpSirTdlsDelAllPeerInd pSirTdlsDelAllPeerInd = (tpSirTdlsDelAllPeerInd) pMsgBuf ;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 8ed85c6..53208ca 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1928,9 +1928,6 @@
case eWNI_SME_TDLS_DEL_ALL_PEER_IND:
case eWNI_SME_MGMT_FRM_TX_COMPLETION_IND:
case eWNI_SME_TDLS_LINK_ESTABLISH_RSP:
-#ifdef FEATURE_WLAN_TDLS_OXYGEN_DISAPPEAR_AP
- case eWNI_SME_TDLS_AP_DISAPPEAR_IND:
-#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
case eWNI_SME_TDLS_DISCOVERY_START_RSP:
case eWNI_SME_TDLS_DISCOVERY_START_IND: