From d085438d4ad4446e44c6b20a5aa11770cd2964b2 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Thu, 3 Jan 2019 11:40:22 +0530 Subject: [PATCH] qcacld-3.0: Cleanup unused LIM MLM states Cleanup unused LIM MLM states: eLIM_MLM_P2P_LISTEN_STATE eLIM_MLM_WT_PROBE_RESP_STATE eLIM_MLM_PASSIVE_SCAN_STATE eLIM_MLM_LEARN_STATE eLIM_MLM_WT_SET_MIMOPS_STATE Change-Id: I04b29adf4729e830b61cebb47bd501caad5ace50 CRs-Fixed: 2375044 --- core/mac/src/pe/include/lim_global.h | 7 +------ core/mac/src/pe/lim/lim_trace.c | 5 ----- core/mac/src/pe/lim/lim_utils.c | 4 ---- core/mac/src/pe/lim/lim_utils.h | 7 ------- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 3 --- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 394e45ac36..4a12ccb971 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -118,8 +118,6 @@ typedef enum eLimSmeStates { typedef enum eLimMlmStates { eLIM_MLM_OFFLINE_STATE, eLIM_MLM_IDLE_STATE, - eLIM_MLM_WT_PROBE_RESP_STATE, - eLIM_MLM_PASSIVE_SCAN_STATE, eLIM_MLM_WT_JOIN_BEACON_STATE, eLIM_MLM_JOINED_STATE, eLIM_MLM_BSS_STARTED_STATE, @@ -134,7 +132,6 @@ typedef enum eLimMlmStates { eLIM_MLM_REASSOCIATED_STATE, eLIM_MLM_LINK_ESTABLISHED_STATE, eLIM_MLM_WT_ASSOC_CNF_STATE, - eLIM_MLM_LEARN_STATE, eLIM_MLM_WT_ADD_BSS_RSP_STATE, eLIM_MLM_WT_DEL_BSS_RSP_STATE, eLIM_MLM_WT_ADD_BSS_RSP_ASSOC_STATE, @@ -153,10 +150,8 @@ typedef enum eLimMlmStates { eLIM_MLM_WT_SET_BSS_KEY_STATE, eLIM_MLM_WT_SET_STA_KEY_STATE, eLIM_MLM_WT_SET_STA_BCASTKEY_STATE, - eLIM_MLM_WT_SET_MIMOPS_STATE, eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE, eLIM_MLM_WT_FT_REASSOC_RSP_STATE, - eLIM_MLM_P2P_LISTEN_STATE, eLIM_MLM_WT_SAE_AUTH_STATE, } tLimMlmStates; diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index c0f16c2cde..6d96679e2b 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -329,8 +329,6 @@ uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState) switch (mlmState) { CASE_RETURN_STRING(eLIM_MLM_OFFLINE_STATE); CASE_RETURN_STRING(eLIM_MLM_IDLE_STATE); - CASE_RETURN_STRING(eLIM_MLM_WT_PROBE_RESP_STATE); - CASE_RETURN_STRING(eLIM_MLM_PASSIVE_SCAN_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_JOIN_BEACON_STATE); CASE_RETURN_STRING(eLIM_MLM_JOINED_STATE); CASE_RETURN_STRING(eLIM_MLM_BSS_STARTED_STATE); @@ -345,7 +343,6 @@ uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState) CASE_RETURN_STRING(eLIM_MLM_REASSOCIATED_STATE); CASE_RETURN_STRING(eLIM_MLM_LINK_ESTABLISHED_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ASSOC_CNF_STATE); - CASE_RETURN_STRING(eLIM_MLM_LEARN_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_DEL_BSS_RSP_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_ASSOC_STATE); @@ -357,10 +354,8 @@ uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState) CASE_RETURN_STRING(eLIM_MLM_WT_SET_BSS_KEY_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_SET_STA_KEY_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_SET_STA_BCASTKEY_STATE); - CASE_RETURN_STRING(eLIM_MLM_WT_SET_MIMOPS_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_FT_REASSOC_RSP_STATE); - CASE_RETURN_STRING(eLIM_MLM_P2P_LISTEN_STATE); default: return "UNKNOWN"; break; diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index c7383a84dc..dbae0cc24b 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -154,10 +154,6 @@ char *lim_mlm_state_str(tLimMlmStates state) return "eLIM_MLM_OFFLINE_STATE"; case eLIM_MLM_IDLE_STATE: return "eLIM_MLM_IDLE_STATE"; - case eLIM_MLM_WT_PROBE_RESP_STATE: - return "eLIM_MLM_WT_PROBE_RESP_STATE"; - case eLIM_MLM_PASSIVE_SCAN_STATE: - return "eLIM_MLM_PASSIVE_SCAN_STATE"; case eLIM_MLM_WT_JOIN_BEACON_STATE: return "eLIM_MLM_WT_JOIN_BEACON_STATE"; case eLIM_MLM_JOINED_STATE: diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index b36a278ce8..426553aa22 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -381,13 +381,6 @@ lim_get_mgmt_staid(struct mac_context *mac, uint16_t *staid, return QDF_STATUS_SUCCESS; } -static inline uint8_t lim_is_system_in_set_mimops_state(struct mac_context *mac) -{ - if (mac->lim.gLimMlmState == eLIM_MLM_WT_SET_MIMOPS_STATE) - return true; - return false; -} - static inline uint8_t is_entering_mimo_ps(tSirMacHTMIMOPowerSaveState curState, tSirMacHTMIMOPowerSaveState newState) 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 823a0c23bf..a6ec97633b 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 @@ -177,8 +177,6 @@ uint8_t *mac_trace_get_lim_mlm_state(uint16_t mlm_state) switch (mlm_state) { CASE_RETURN_STRING(eLIM_MLM_OFFLINE_STATE); CASE_RETURN_STRING(eLIM_MLM_IDLE_STATE); - CASE_RETURN_STRING(eLIM_MLM_WT_PROBE_RESP_STATE); - CASE_RETURN_STRING(eLIM_MLM_PASSIVE_SCAN_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_JOIN_BEACON_STATE); CASE_RETURN_STRING(eLIM_MLM_JOINED_STATE); CASE_RETURN_STRING(eLIM_MLM_BSS_STARTED_STATE); @@ -193,7 +191,6 @@ uint8_t *mac_trace_get_lim_mlm_state(uint16_t mlm_state) CASE_RETURN_STRING(eLIM_MLM_REASSOCIATED_STATE); CASE_RETURN_STRING(eLIM_MLM_LINK_ESTABLISHED_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ASSOC_CNF_STATE); - CASE_RETURN_STRING(eLIM_MLM_LEARN_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_DEL_BSS_RSP_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_ADD_BSS_RSP_ASSOC_STATE);