wlan: Limit further ADDBA requests if AP/STA declines the request
Currently DUT sends ADDBA request for every 1 sec even when AP/STA declines
every request due to its configuration to reject ADDBA request.
To address this, increase BA timestamp to (failure_count * 5) mins for
each rejection and stop sending ADDBA request after 10 rejections.
Change-Id: I93dc66c00279b7e77bf20990151e4b5bbe0bfbc2
CRS-Fixed: 1037741
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index cb3dbb4..1d50dbf 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -255,6 +255,11 @@
void *pMlmDeauthReq;
}tLimDisassocDeauthCnfReq;
+typedef struct {
+ tANI_U32 failed_count[MAX_TIDS];
+ v_TIME_t failed_timestamp[MAX_TIDS];
+} tLimStaBAInfo;
+
typedef struct sAniSirLim
{
////////////////////////////////////// TIMER RELATED START ///////////////////////////////////////////
@@ -908,6 +913,7 @@
tANI_U32 remOnChnSeqNum;
tANI_U32 txBdToken;
tANI_U32 EnableTdls2040BSSCoexIE;
+ tLimStaBAInfo staBaInfo[WLAN_MAX_STA_COUNT];
} tAniSirLim, *tpAniSirLim;
typedef struct sLimMgmtFrameRegistration
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 6d34461..f49aa01 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -444,6 +444,7 @@
pMac->lim.gHTDualCTSProtection = 0;
pMac->lim.gHTSTBCBasicMCS = 0;
pMac->lim.gAddBA_Declined = 0; // Flag to Decline the BAR if the particular bit (0-7) is being set
+ vos_mem_set(&pMac->lim.staBaInfo, sizeof(pMac->lim.staBaInfo), 0);
}
static tSirRetStatus __limInitConfig( tpAniSirGlobal pMac )
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index cb91604..ab54e41 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -1541,6 +1541,10 @@
if( eSIR_MAC_SUCCESS_STATUS == frmAddBARsp.Status.status )
{
tANI_U32 val;
+ pMac->lim.staBaInfo[pSta->staIndex].
+ failed_count[frmAddBARsp.AddBAParameterSet.tid] = 0;
+ pMac->lim.staBaInfo[pSta->staIndex].
+ failed_timestamp[frmAddBARsp.AddBAParameterSet.tid] = 0;
if (wlan_cfgGetInt(pMac, WNI_CFG_NUM_BUFF_ADVERT , &val) != eSIR_SUCCESS)
{
limLog(pMac, LOG1, FL("Unable to get WNI_CFG_NUM_BUFF_ADVERT"));
@@ -1567,8 +1571,13 @@
}
}
else
+ {
+ pMac->lim.staBaInfo[pSta->staIndex].
+ failed_count[frmAddBARsp.AddBAParameterSet.tid]++;
+ pMac->lim.staBaInfo[pSta->staIndex].failed_timestamp[
+ frmAddBARsp.AddBAParameterSet.tid] = jiffies_to_msecs(jiffies);
goto returnAfterError;
-
+ }
// Change STA state to wait for ADDBA Rsp from HAL
LIM_SET_STA_BA_STATE(pSta, frmAddBARsp.AddBAParameterSet.tid, eLIM_BA_STATE_WT_ADD_RSP);
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 706940d..3166e99 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -136,6 +136,8 @@
#define WDA_MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
#define WDA_MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define WDA_DUMPCMD_WAIT_TIMEOUT 10000
+#define WDA_BA_MAX_RETRY_THRESHOLD 10
+#define WDA_BA_RETRY_TIME 300000 /* Time is in msec, equal to 5 mins */
/* extern declarations */
extern void vos_WDAComplete_cback(v_PVOID_t pVosContext);
@@ -160,6 +162,7 @@
void* pUserData ) ;
static VOS_STATUS wdaCreateTimers(tWDA_CbContext *pWDA) ;
static VOS_STATUS wdaDestroyTimers(tWDA_CbContext *pWDA);
+bool WDA_AllowAddBA(tpAniSirGlobal pMAc, tANI_U8 staId, tANI_U8 tid);
void WDA_BaCheckActivity(tWDA_CbContext *pWDA) ;
void WDA_TimerTrafficStatsInd(tWDA_CbContext *pWDA);
void WDA_HALDumpCmdCallback(WDI_HALDumpCmdRspParamsType *wdiRspParams, void* pUserData);
@@ -17374,6 +17377,24 @@
}
}
+bool WDA_AllowAddBA(tpAniSirGlobal pMac, tANI_U8 staId, tANI_U8 tid)
+{
+ if (!pMac->lim.staBaInfo[staId].failed_count[tid])
+ return true;
+ if ((WDA_BA_MAX_RETRY_THRESHOLD <=
+ pMac->lim.staBaInfo[staId].failed_count[tid]) ||
+ ((pMac->lim.staBaInfo[staId].failed_timestamp[tid] +
+ (pMac->lim.staBaInfo[staId].failed_count[tid] * WDA_BA_RETRY_TIME)) >=
+ jiffies_to_msecs(jiffies)))
+ {
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "%s: AP/STA has declined ADDBA req for tid %d, declined %d times",
+ __func__, tid, pMac->lim.staBaInfo[staId].failed_count[tid]);
+ return false;
+ }
+ return true;
+}
+
/*
* BA Activity check timer handler
*/
@@ -17462,6 +17483,7 @@
}
else if(!WDA_GET_BA_TXFLAG(pWDA, curSta, tid)
&& (WLANTL_STA_AUTHENTICATED == tlSTAState)
+ && WDA_AllowAddBA(pMac, curSta, tid)
&& (((eSYSTEM_STA_IN_IBSS_ROLE ==
pWDA->wdaGlobalSystemRole) && txPktCount )
|| (txPktCount >= WDA_LAST_POLLED_THRESHOLD(pWDA,