From 526c7a7054ad3c4b2eaeb8ef47bb986292c4d6d2 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 22 Sep 2017 18:06:44 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete eWNI_SME_TKIP_CNTR_MEAS_REQ Change "qcacld-3.0: Remove csr_roam_issue_tkip_counter_measures()" removed the only sender of message eWNI_SME_TKIP_CNTR_MEAS_REQ. Since this message is no longer used, remove it along with the now obsolete handler code. Change-Id: I7ff4dfb455daa464379b8d6a65e0a4cd3eb75570 CRs-Fixed: 2115345 --- core/mac/inc/wni_api.h | 1 - .../src/pe/lim/lim_process_message_queue.c | 1 - .../src/pe/lim/lim_process_sme_req_messages.c | 27 ------------------- .../src/sys/legacy/src/utils/src/mac_trace.c | 1 - 4 files changed, 30 deletions(-) diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index b1ad409b3eb3..028a7870a8ef 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -93,7 +93,6 @@ enum eWniMsgTypes { eWNI_SME_GET_STATISTICS_RSP, eWNI_SME_GET_RSSI_REQ, eWNI_SME_GET_ASSOC_STAS_REQ, - eWNI_SME_TKIP_CNTR_MEAS_REQ, eWNI_SME_UPDATE_APWPSIE_REQ, eWNI_SME_GET_WPSPBC_SESSION_REQ, eWNI_SME_WPS_PBC_PROBE_REQ_IND, 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 2899ec4198fc..8d37de0c208b 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1447,7 +1447,6 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, case eWNI_SME_ADDTS_REQ: case eWNI_SME_DELTS_REQ: case eWNI_SME_GET_ASSOC_STAS_REQ: - case eWNI_SME_TKIP_CNTR_MEAS_REQ: case eWNI_SME_UPDATE_APWPSIE_REQ: case eWNI_SME_SESSION_UPDATE_PARAM: case eWNI_SME_GET_WPSPBC_SESSION_REQ: diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index ac737c1ba787..b8f5f317d1a3 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3190,29 +3190,6 @@ static void __lim_counter_measures(tpAniSirGlobal pMac, tpPESession psessionEntr mac, psessionEntry, false); }; -static void lim_process_tkip_counter_measures(tpAniSirGlobal pMac, - uint32_t *pMsgBuf) -{ - tSirSmeTkipCntrMeasReq tkipCntrMeasReq; - tpPESession psessionEntry; - uint8_t sessionId; /* PE sessionId */ - - qdf_mem_copy(&tkipCntrMeasReq, pMsgBuf, - sizeof(struct sSirSmeTkipCntrMeasReq)); - - psessionEntry = pe_find_session_by_bssid(pMac, - tkipCntrMeasReq.bssId.bytes, &sessionId); - if (NULL == psessionEntry) { - pe_err("session does not exist for given BSSID"); - return; - } - - if (tkipCntrMeasReq.bEnable) - __lim_counter_measures(pMac, psessionEntry); - - psessionEntry->bTkipCntrMeasActive = tkipCntrMeasReq.bEnable; -} - static void __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) { @@ -5073,10 +5050,6 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, case eWNI_SME_GET_ASSOC_STAS_REQ: lim_process_sme_get_assoc_sta_info(pMac, pMsgBuf); break; - case eWNI_SME_TKIP_CNTR_MEAS_REQ: - lim_process_tkip_counter_measures(pMac, pMsgBuf); - break; - case eWNI_SME_SESSION_UPDATE_PARAM: __lim_process_sme_session_update(pMac, pMsgBuf); break; 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 684633ce54ab..05167c684446 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 @@ -269,7 +269,6 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg) CASE_RETURN_STRING(eWNI_SME_GET_STATISTICS_RSP); CASE_RETURN_STRING(eWNI_SME_GET_RSSI_REQ); CASE_RETURN_STRING(eWNI_SME_GET_ASSOC_STAS_REQ); - CASE_RETURN_STRING(eWNI_SME_TKIP_CNTR_MEAS_REQ); CASE_RETURN_STRING(eWNI_SME_UPDATE_APWPSIE_REQ); CASE_RETURN_STRING(eWNI_SME_GET_WPSPBC_SESSION_REQ); CASE_RETURN_STRING(eWNI_SME_WPS_PBC_PROBE_REQ_IND);