summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/mac/inc/ani_global.h7
-rw-r--r--core/mac/src/include/sir_params.h1
-rw-r--r--core/mac/src/pe/include/lim_global.h4
-rw-r--r--core/mac/src/pe/lim/lim_api.c5
-rw-r--r--core/mac/src/pe/lim/lim_process_message_queue.c2
-rw-r--r--core/mac/src/pe/lim/lim_timer_utils.c51
-rw-r--r--core/mac/src/pe/lim/lim_timer_utils.h1
-rw-r--r--core/mac/src/pe/lim/lim_utils.c6
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/mac_trace.c1
9 files changed, 0 insertions, 78 deletions
diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index b1f76939dd1f..7c3397dc7dd7 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -290,9 +290,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 */
@@ -674,10 +671,6 @@ typedef struct sAniSirLim {
/* Place holder for Pre-authentication node list */
struct tLimPreAuthNode *pLimPreAuthList;
- /* Send Disassociate frame threshold parameters */
- uint16_t gLimDisassocFrameThreshold;
- uint16_t gLimDisassocFrameCredit;
-
/* Assoc or ReAssoc Response Data/Frame */
void *gLimAssocResponseData;
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index b050354d6501..3fe1af30659f 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -695,7 +695,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)
/* currently unused (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/lim_global.h b/core/mac/src/pe/include/lim_global.h
index a563601a600b..be0efaf94f0d 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -51,10 +51,6 @@
#include "dot11f.h"
#include "wma_if.h"
-/* 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/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 901c564df9da..e1ee86334f6c 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -285,11 +285,6 @@ static void __lim_init_assoc_vars(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. */
qdf_mem_set(pMac->lim.protStaOverlapCache,
sizeof(tCacheParams) * LIM_PROT_STA_OVERLAP_CACHE_SIZE, 0);
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index 29f515b2cad8..f447c6e79d7d 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1656,8 +1656,6 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
case SIR_LIM_PROBE_HB_FAILURE_TIMEOUT:
lim_handle_heart_beat_failure_timeout(mac_ctx);
break;
- case SIR_LIM_HASH_MISS_THRES_TIMEOUT:
- mac_ctx->lim.gLimDisassocFrameCredit = 0;
break;
case SIR_LIM_CNF_WAIT_TIMEOUT:
/* Does not receive CNF or dummy packet */
diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c
index cb244dd65d96..2111ac540c82 100644
--- a/core/mac/src/pe/lim/lim_timer_utils.c
+++ b/core/mac/src/pe/lim/lim_timer_utils.c
@@ -265,20 +265,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
if (false == lim_create_non_ap_timers(pMac))
goto err_timer;
- cfgValue = SYS_MS_TO_TICKS(LIM_HASH_MISS_TIMER_MS);
-
- if (tx_timer_create(pMac,
- &pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer,
- "Disassoc throttle TIMEOUT",
- lim_send_disassoc_frame_threshold_handler,
- SIR_LIM_HASH_MISS_THRES_TIMEOUT, cfgValue, cfgValue,
- TX_AUTO_ACTIVATE) != TX_SUCCESS) {
- lim_log(pMac, LOGP,
- FL("create Disassociate throttle timer failed"));
- goto err_timer;
- }
- PELOG1(lim_log(pMac, LOG1, FL("Created Disassociate throttle timer "));)
-
/* Create all CNF_WAIT Timers upfront */
if (wlan_cfg_get_int(pMac, WNI_CFG_WT_CNF_TIMEOUT, &cfgValue)
!= eSIR_SUCCESS) {
@@ -409,8 +395,6 @@ err_timer:
while (((int32_t)-- i) >= 0) {
tx_timer_delete(&pMac->lim.limTimers.gpLimCnfWaitTimer[i]);
}
- tx_timer_delete(&pMac->lim.limTimers.
- gLimSendDisassocFrameThresholdTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimProbeAfterHBTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAuthFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAddtsRspTimer);
@@ -1221,41 +1205,6 @@ void lim_activate_auth_rsp_timer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode
}
/**
- * lim_send_disassoc_frame_threshold_handler()
- *
- ***FUNCTION:
- * This function reloads the credit to the send disassociate frame bucket
- *
- ***LOGIC:
- *
- ***ASSUMPTIONS:
- *
- ***NOTE:
- * NA
- *
- * @param
- *
- * @return None
- */
-
-void lim_send_disassoc_frame_threshold_handler(void *pMacGlobal, uint32_t param)
-{
- tSirMsgQ msg;
- uint32_t statusCode;
- tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
-
- msg.type = SIR_LIM_HASH_MISS_THRES_TIMEOUT;
- msg.bodyval = 0;
- msg.bodyptr = NULL;
-
- statusCode = lim_post_msg_api(pMac, &msg);
- if (statusCode != eSIR_SUCCESS)
- lim_log(pMac, LOGE,
- FL("posting to LIM failed, reason=%d"), statusCode);
-
-}
-
-/**
* limAssocCnfWaitTmerHandler()
*
***FUNCTION:
diff --git a/core/mac/src/pe/lim/lim_timer_utils.h b/core/mac/src/pe/lim/lim_timer_utils.h
index 50f3ef4d0899..c4fa19711445 100644
--- a/core/mac/src/pe/lim/lim_timer_utils.h
+++ b/core/mac/src/pe/lim/lim_timer_utils.h
@@ -83,7 +83,6 @@ void limReassocFailureTimerHandler(void *, uint32_t);
void lim_deactivate_and_change_timer(tpAniSirGlobal, uint32_t);
void limDummyPktExpTimerHandler(void *, uint32_t);
-void lim_send_disassoc_frame_threshold_handler(void *, uint32_t);
void lim_cnf_wait_tmer_handler(void *, uint32_t);
void lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal, uint32_t, uint16_t);
void lim_activate_cnf_timer(tpAniSirGlobal, uint16_t, tpPESession);
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index ba731b8ff299..e0fa701f5376 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -663,12 +663,6 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx)
n++)
tx_timer_delete(&pAuthNode[n]->timer);
- /* Deactivate and delete Hash Miss throttle timer */
- tx_timer_deactivate(&lim_timer->
- gLimSendDisassocFrameThresholdTimer);
- tx_timer_delete(&lim_timer->
- gLimSendDisassocFrameThresholdTimer);
-
tx_timer_deactivate(&lim_timer->gLimUpdateOlbcCacheTimer);
tx_timer_delete(&lim_timer->gLimUpdateOlbcCacheTimer);
tx_timer_deactivate(&lim_timer->gLimPreAuthClnupTimer);
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index 63acd730a64f..0845d33f82c9 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -681,7 +681,6 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg)
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_UPDATE_OLBC_CACHEL_TIMEOUT);
CASE_RETURN_STRING(SIR_LIM_CHANNEL_SWITCH_TIMEOUT);