From 506f645fd2bc9bf934354afa178dd007e93625ea Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 17 Nov 2018 20:11:27 -0800 Subject: [PATCH] qcacld-3.0: Remove SIR_LIM_RETRY_INTERRUPT_MSG Message id SIR_LIM_RETRY_INTERRUPT_MSG is obsolete, so remove it. Change-Id: Iac54c19eb078341057e56418dfeccdae98d8e088 CRs-Fixed: 2353419 --- core/mac/src/include/sir_params.h | 15 +++++++-------- core/mac/src/pe/lim/lim_process_message_queue.c | 3 --- core/mac/src/pe/lim/lim_utils.c | 2 -- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 1 - 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 893b930deac2..928a86c14452 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -697,15 +697,14 @@ struct sir_mgmt_msg { /* LIM message types */ #define SIR_LIM_MSG_TYPES_BEGIN (SIR_LIM_MODULE_ID << 8) #define SIR_LIM_ITC_MSG_TYPES_BEGIN (SIR_LIM_MSG_TYPES_BEGIN+0xB0) - -/* Messages to/from HAL */ -/* Removed as part of moving HAL down to FW */ - -/* Message from ISR upon TFP retry interrupt */ -#define SIR_LIM_RETRY_INTERRUPT_MSG (SIR_LIM_ITC_MSG_TYPES_BEGIN + 3) +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 0) */ +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 1) */ +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 2) */ +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 3) */ /* Message from BB Transport */ -#define SIR_BB_XPORT_MGMT_MSG (SIR_LIM_ITC_MSG_TYPES_BEGIN + 4) -/* UNUSED SIR_LIM_ITC_MSG_TYPES_BEGIN + 6 */ +#define SIR_BB_XPORT_MGMT_MSG (SIR_LIM_ITC_MSG_TYPES_BEGIN + 4) +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 5) */ +/* UNUSED (SIR_LIM_ITC_MSG_TYPES_BEGIN + 6) */ /* Message from ISR upon SP's Invalid session key interrupt */ #define SIR_LIM_INV_KEY_INTERRUPT_MSG (SIR_LIM_ITC_MSG_TYPES_BEGIN + 7) /* Message from ISR upon SP's Invalid key ID interrupt */ 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 689e5ac2f3df..bc6e19529b36 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1797,9 +1797,6 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx, /* Does not receive CNF or dummy packet */ lim_handle_cnf_wait_timeout(mac_ctx, (uint16_t) msg->bodyval); break; - case SIR_LIM_RETRY_INTERRUPT_MSG: - /* Message from ISR upon TFP's max retry limit interrupt */ - break; case SIR_LIM_INV_KEY_INTERRUPT_MSG: /* Message from ISR upon SP's Invalid session key interrupt */ break; diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 0f02a972628b..e79da68445a0 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -339,8 +339,6 @@ char *lim_msg_str(uint32_t msgType) return "eWNI_SME_DELTS_IND"; case WMA_SUSPEND_ACTIVITY_RSP: return "WMA_SUSPEND_ACTIVITY_RSP"; - case SIR_LIM_RETRY_INTERRUPT_MSG: - return "SIR_LIM_RETRY_INTERRUPT_MSG"; case SIR_BB_XPORT_MGMT_MSG: return "SIR_BB_XPORT_MGMT_MSG"; case SIR_LIM_INV_KEY_INTERRUPT_MSG: 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 a3d4f5dbda53..aa73f2917342 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 @@ -671,7 +671,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg) { switch (lim_msg) { - CASE_RETURN_STRING(SIR_LIM_RETRY_INTERRUPT_MSG); CASE_RETURN_STRING(SIR_BB_XPORT_MGMT_MSG); CASE_RETURN_STRING(SIR_LIM_INV_KEY_INTERRUPT_MSG); CASE_RETURN_STRING(SIR_LIM_KEY_ID_INTERRUPT_MSG);