diff options
| author | Mahesh A Saptasagar <c_msapta@qti.qualcomm.com> | 2015-06-29 18:17:08 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-07-07 15:36:27 +0530 |
| commit | 4597c4d583ffb68c12fa94fad7353bcb86a7b043 (patch) | |
| tree | e49e2568bb5b50ad87c2805bd2c4dc397f532d2e | |
| parent | db6b747ff9d9be5814ab05004f8968cf099a3252 (diff) | |
qcacld-2.0: Remove unused gLimSendDisassocFrameThresholdTimer timer
prima to qcacld-2.0 propagation
Remove the unwanted timer and its related code.
Change-Id: I469bf11a506a2901eae2865a69b75a058e276e75
CRs-Fixed: 658580
| -rw-r--r-- | CORE/MAC/inc/aniGlobal.h | 7 | ||||
| -rw-r--r-- | CORE/MAC/src/include/sirParams.h | 1 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/include/limGlobal.h | 4 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limApi.c | 7 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessMessageQueue.c | 10 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limTimerUtils.c | 58 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limTimerUtils.h | 3 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limUtils.c | 4 | ||||
| -rw-r--r-- | CORE/SYS/legacy/src/utils/src/macTrace.c | 1 |
9 files changed, 1 insertions, 94 deletions
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h index 4c1235f8dabc..fb9fd50b78d3 100644 --- a/CORE/MAC/inc/aniGlobal.h +++ b/CORE/MAC/inc/aniGlobal.h @@ -366,9 +366,6 @@ typedef struct sLimTimers // CNF_WAIT timer TX_TIMER *gpLimCnfWaitTimer; - // Send Disassociate frame threshold parameters - TX_TIMER gLimSendDisassocFrameThresholdTimer; - TX_TIMER gLimAddtsRspTimer; // max wait for a response // Update OLBC Cache Timer @@ -843,10 +840,6 @@ typedef struct sAniSirLim // Place holder for Pre-authentication node list struct tLimPreAuthNode * pLimPreAuthList; - // Send Disassociate frame threshold parameters - tANI_U16 gLimDisassocFrameThreshold; - tANI_U16 gLimDisassocFrameCredit; - // Assoc or ReAssoc Response Data/Frame void *gLimAssocResponseData; diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h index cac8fc34a8e8..ecc7feddfe94 100644 --- a/CORE/MAC/src/include/sirParams.h +++ b/CORE/MAC/src/include/sirParams.h @@ -845,7 +845,6 @@ typedef struct sSirMbMsgP2p #define SIR_LIM_PROBE_HB_FAILURE_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0xB) #define SIR_LIM_ADDTS_RSP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0xC) #define SIR_LIM_LINK_TEST_DURATION_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x13) -#define SIR_LIM_HASH_MISS_THRES_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x16) #define SIR_LIM_CNF_WAIT_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x17) #define SIR_LIM_KEEPALIVE_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x18) #define SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x19) diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h index 19c9f8e7f24f..f9b16a7a7e3f 100644 --- a/CORE/MAC/src/pe/include/limGlobal.h +++ b/CORE/MAC/src/pe/include/limGlobal.h @@ -54,10 +54,6 @@ /// Maximum number of scan hash table entries #define LIM_MAX_NUM_OF_SCAN_RESULTS 256 -// Sending Disassociate frames threshold -#define LIM_SEND_DISASSOC_FRAME_THRESHOLD 2 -#define LIM_HASH_MISS_TIMER_MS 10000 - // Deferred Message Queue Length #define MAX_DEFERRED_QUEUE_LEN 80 diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index 4b41ef7f6d2e..1d81811f8da9 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -335,10 +335,6 @@ static void __limInitAssocVars(tpAniSirGlobal pMac) // Place holder for Pre-authentication node list pMac->lim.pLimPreAuthList = NULL; - // Send Disassociate frame threshold parameters - pMac->lim.gLimDisassocFrameThreshold = LIM_SEND_DISASSOC_FRAME_THRESHOLD; - pMac->lim.gLimDisassocFrameCredit = 0; - //One cache for each overlap and associated case. vos_mem_set(pMac->lim.protStaOverlapCache, sizeof(tCacheParams) * LIM_PROT_STA_OVERLAP_CACHE_SIZE, 0); @@ -1108,9 +1104,6 @@ tANI_U8 limIsTimerAllowedInPowerSaveState(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT: retStatus = FALSE; break; - /* May allow following timer messages in sleep mode */ - case SIR_LIM_HASH_MISS_THRES_TIMEOUT: - /* Safe to allow as of today, this triggers background scan * which will not be started if the device is in power-save mode * might need to block in the future if we decide to implement diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c index 2b7eb3f7830e..67bb2110a1e2 100644 --- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c +++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c @@ -1834,16 +1834,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) limTriggerBackgroundScan(pMac); break; - - case SIR_LIM_HASH_MISS_THRES_TIMEOUT: - - /* - ** clear the credit to the send disassociate frame bucket - **/ - - pMac->lim.gLimDisassocFrameCredit = 0; - break; - case SIR_LIM_CNF_WAIT_TIMEOUT: /* diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c index 8953530cb524..05be3fc41a74 100644 --- a/CORE/MAC/src/pe/lim/limTimerUtils.c +++ b/CORE/MAC/src/pe/lim/limTimerUtils.c @@ -471,27 +471,6 @@ limCreateTimers(tpAniSirGlobal pMac) } } - - cfgValue = SYS_MS_TO_TICKS(LIM_HASH_MISS_TIMER_MS); - - if (tx_timer_create( - &pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer, - "Disassoc throttle TIMEOUT", - limSendDisassocFrameThresholdHandler, - SIR_LIM_HASH_MISS_THRES_TIMEOUT, - cfgValue, - cfgValue, - TX_AUTO_ACTIVATE) != TX_SUCCESS) - { - /// Could not start Send Disassociate Frame Threshold timer. - // Log error - limLog(pMac, LOGP, - FL("create Disassociate throttle timer failed")); - goto err_timer; - } - PELOG1(limLog(pMac, LOG1, - FL("Created Disassociate throttle timer "));) - /** * Create keep alive timer and activate it right away for AP role */ @@ -755,7 +734,6 @@ limCreateTimers(tpAniSirGlobal pMac) tx_timer_delete(&pMac->lim.limTimers.gpLimCnfWaitTimer[i]); } tx_timer_delete(&pMac->lim.limTimers.gLimKeepaliveTimer); - tx_timer_delete(&pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer); tx_timer_delete(&pMac->lim.limTimers.gLimBackgroundScanTimer); tx_timer_delete(&pMac->lim.limTimers.gLimProbeAfterHBTimer); tx_timer_delete(&pMac->lim.limTimers.gLimHeartBeatTimer); @@ -2085,42 +2063,6 @@ void limActivateAuthRspTimer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode) } } - -/** - * limSendDisassocFrameThresholdHandler() - * - *FUNCTION: - * This function reloads the credit to the send disassociate frame bucket - * - *LOGIC: - * - *ASSUMPTIONS: - * - *NOTE: - * NA - * - * @param - * - * @return None - */ - -void -limSendDisassocFrameThresholdHandler(void *pMacGlobal, tANI_U32 param) -{ - tSirMsgQ msg; - tANI_U32 statusCode; - tpAniSirGlobal pMac = (tpAniSirGlobal)pMacGlobal; - - msg.type = SIR_LIM_HASH_MISS_THRES_TIMEOUT; - msg.bodyval = 0; - msg.bodyptr = NULL; - - if ((statusCode = limPostMsgApi(pMac, &msg)) != eSIR_SUCCESS) - limLog(pMac, LOGE, - FL("posting to LIM failed, reason=%d"), statusCode); - -} - /** * limAssocCnfWaitTmerHandler() * diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h index ef833472bf7f..3f4243a8ae56 100644 --- a/CORE/MAC/src/pe/lim/limTimerUtils.h +++ b/CORE/MAC/src/pe/lim/limTimerUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-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. * @@ -96,7 +96,6 @@ void limDeactivateAndChangeTimer(tpAniSirGlobal, tANI_U32); void limHeartBeatDeactivateAndChangeTimer(tpAniSirGlobal, tpPESession); void limReactivateHeartBeatTimer(tpAniSirGlobal, tpPESession); void limDummyPktExpTimerHandler(void *, tANI_U32); -void limSendDisassocFrameThresholdHandler(void *, tANI_U32); void limCnfWaitTmerHandler(void *, tANI_U32); void limKeepaliveTmerHandler(void *, tANI_U32); void limDeactivateAndChangePerStaIdTimer(tpAniSirGlobal, tANI_U32, tANI_U16); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 156c2c795ef2..f4569d25a3ea 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -726,10 +726,6 @@ limCleanupMlm(tpAniSirGlobal pMac) tx_timer_delete(&pAuthNode[n]->timer); } - // Deactivate and delete Hash Miss throttle timer - tx_timer_deactivate(&pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer); - tx_timer_delete(&pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer); - tx_timer_deactivate(&pMac->lim.limTimers.gLimUpdateOlbcCacheTimer); tx_timer_delete(&pMac->lim.limTimers.gLimUpdateOlbcCacheTimer); tx_timer_deactivate(&pMac->lim.limTimers.gLimPreAuthClnupTimer); diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c index 6258e6309002..c0a74f28e5bb 100644 --- a/CORE/SYS/legacy/src/utils/src/macTrace.c +++ b/CORE/SYS/legacy/src/utils/src/macTrace.c @@ -1035,7 +1035,6 @@ tANI_U8* macTraceGetLimMsgString(tANI_U16 limMsg) CASE_RETURN_STRING(SIR_LIM_PROBE_HB_FAILURE_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_ADDTS_RSP_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_LINK_TEST_DURATION_TIMEOUT); - CASE_RETURN_STRING(SIR_LIM_HASH_MISS_THRES_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_CNF_WAIT_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_KEEPALIVE_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT); |
