wlan: flush cached frames on assoc failure
Prima driver caches RX frames till the peer
is registered in TL. If assocication failure
occurs then free the cached frames so that
the RX resources are returned back to the
system.
Change-Id: I37d6c08075dc77026ad85863e4838eb5e3742fc3
CRs-Fixed: 643670
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 3a01008..639baca 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1544,6 +1544,8 @@
/*Clear the roam profile*/
hdd_clearRoamProfileIe( pAdapter );
+ WLANTL_AssocFailed(pRoamInfo->staId);
+
netif_tx_disable(dev);
netif_carrier_off(dev);
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index dccddb2..402644d 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -1028,7 +1028,7 @@
if(!VOS_IS_STATUS_SUCCESS(WLANTL_StartForwarding(staId,0,0)))
{
VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- " %s fails to start forwarding", __func__);
+ " %s fails to start forwarding (staId %d)", __func__, staId);
}
}
@@ -4732,12 +4732,28 @@
{
/*this is the first frame that we are caching */
pClientSTA->vosBegCachedFrame = vosTempBuff;
+
+ pClientSTA->tlCacheInfo.cacheInitTime = vos_timer_get_system_time();
+ pClientSTA->tlCacheInfo.cacheDoneTime =
+ pClientSTA->tlCacheInfo.cacheInitTime;
+ pClientSTA->tlCacheInfo.cacheSize = 1;
+
}
else
{
/*this is a subsequent frame that we are caching: chain to the end */
vos_pkt_chain_packet(pClientSTA->vosEndCachedFrame,
vosTempBuff, VOS_TRUE);
+
+ pClientSTA->tlCacheInfo.cacheDoneTime = vos_timer_get_system_time();
+ pClientSTA->tlCacheInfo.cacheSize ++;
+
+ if (pClientSTA->tlCacheInfo.cacheSize % WLANTL_CACHE_TRACE_WATERMARK == 0)
+ {
+ VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
+ "%s: Cache High watermark for staid:%d (%d)",
+ __func__,ucSTAId, pClientSTA->tlCacheInfo.cacheSize);
+ }
}
pClientSTA->vosEndCachedFrame = vosTempBuff;
}/*else new packet*/
@@ -4927,6 +4943,8 @@
-------------------------------------------------------------------------*/
pClientSTA->vosBegCachedFrame = NULL;
pClientSTA->vosEndCachedFrame = NULL;
+ pClientSTA->tlCacheInfo.cacheSize = 0;
+ pClientSTA->tlCacheInfo.cacheClearTime = vos_timer_get_system_time();
/*-----------------------------------------------------------------------
After all the init is complete we can mark the existance flag
@@ -6060,7 +6078,6 @@
-------------------------------------------------------------------------*/
pClientSTA = pTLCb->atlSTAClients[ucSTAId];
-
if ( NULL == pClientSTA )
{
TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h
index 58ff8a0..36d1f29 100644
--- a/CORE/TL/src/wlan_qct_tli.h
+++ b/CORE/TL/src/wlan_qct_tli.h
@@ -241,6 +241,7 @@
((WLANTL_BT_AMP_TYPE_AR == usType) || (WLANTL_BT_AMP_TYPE_SEC == usType) || \
(WLANTL_BT_AMP_TYPE_LS_REQ == usType) || (WLANTL_BT_AMP_TYPE_LS_REP == usType))
+#define WLANTL_CACHE_TRACE_WATERMARK 100
/*---------------------------------------------------------------------------
TL signals for TX thread
---------------------------------------------------------------------------*/
@@ -464,6 +465,17 @@
}WLANTL_UAPSDInfoType;
/*---------------------------------------------------------------------------
+ per-STA cache info
+---------------------------------------------------------------------------*/
+typedef struct
+{
+ v_U16_t cacheSize;
+ v_TIME_t cacheInitTime;
+ v_TIME_t cacheDoneTime;
+ v_TIME_t cacheClearTime;
+}WLANTL_CacheInfoType;
+
+/*---------------------------------------------------------------------------
STA Client type
---------------------------------------------------------------------------*/
typedef struct
@@ -584,7 +596,7 @@
/*Begining of the cached packets chain*/
vos_pkt_t* vosEndCachedFrame;
-
+ WLANTL_CacheInfoType tlCacheInfo;
/* LWM related fields */
//current station is slow. LWM mode is enabled.