From ba6629747d43150153afdf2d5fa0bfc4aecd8408 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Wed, 5 Jul 2017 16:07:08 -0700 Subject: [PATCH] qcacld-3.0: Remove state eLIM_SME_WT_REASSOC_LINK_FAIL_STATE Remove obsolete state eLIM_SME_WT_REASSOC_LINK_FAIL_STATE. Change-Id: Ief46fe3a5ab222e214fe720f3ae6e7e7baac6eaa CRs-Fixed: 2071677 --- core/mac/src/pe/include/lim_global.h | 1 - core/mac/src/pe/lim/lim_reassoc_utils.c | 52 ++----------------- core/mac/src/pe/lim/lim_trace.c | 1 - core/mac/src/pe/lim/lim_utils.c | 2 - .../src/sys/legacy/src/utils/src/mac_trace.c | 1 - 5 files changed, 3 insertions(+), 54 deletions(-) diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 014ee6ae98..8cb627c721 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -99,7 +99,6 @@ typedef enum eLimSmeStates { eLIM_SME_WT_AUTH_STATE, eLIM_SME_WT_ASSOC_STATE, eLIM_SME_WT_REASSOC_STATE, - eLIM_SME_WT_REASSOC_LINK_FAIL_STATE, eLIM_SME_JOIN_FAILURE_STATE, eLIM_SME_ASSOCIATED_STATE, eLIM_SME_REASSOCIATED_STATE, diff --git a/core/mac/src/pe/lim/lim_reassoc_utils.c b/core/mac/src/pe/lim/lim_reassoc_utils.c index 120fdff36d..2e19b8e638 100644 --- a/core/mac/src/pe/lim/lim_reassoc_utils.c +++ b/core/mac/src/pe/lim/lim_reassoc_utils.c @@ -213,24 +213,6 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, psessionEntry->limAssocResponseData = NULL; } break; - case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: - { - mlmReassocCnf.resultCode = - pStaDs->mlmStaContext.disassocReason; - mlmReassocCnf.protStatusCode = - pStaDs->mlmStaContext.cleanupTrigger; - /** Set the SME State back to WT_Reassoc State*/ - psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, - pStaDs->assocId, psessionEntry); - if (LIM_IS_STA_ROLE(psessionEntry)) { - psessionEntry->limMlmState = - eLIM_MLM_IDLE_STATE; - } - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); - } - break; default: pe_err("DelBss in wrong system Role and SME State"); mlmReassocCnf.resultCode = eSIR_SME_REFUSED; @@ -356,33 +338,6 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, qdf_mem_free(pBeaconStruct); } break; - case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: { - /* Case wherein the DisAssoc / Deauth - * being sent as response to ReAssoc Req - * Send the Reason code as the same received - * in Disassoc / Deauth Frame - */ - mlmReassocCnf.resultCode = - pStaDs->mlmStaContext.disassocReason; - mlmReassocCnf.protStatusCode = - pStaDs->mlmStaContext.cleanupTrigger; - /** Set the SME State back to WT_Reassoc State*/ - psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, - pStaDs->assocId, psessionEntry); - if (LIM_IS_STA_ROLE(psessionEntry)) { - psessionEntry->limMlmState = - eLIM_MLM_IDLE_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, - psessionEntry->peSessionId, - psessionEntry->limMlmState)); - } - - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); - } - break; default: pe_err("DelBss in the wrong system Role and SME State"); mlmReassocCnf.resultCode = eSIR_SME_REFUSED; @@ -408,10 +363,9 @@ bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry) { if (psessionEntry == NULL) return false; - if ((LIM_IS_STA_ROLE(psessionEntry)) && - ((psessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) || - (psessionEntry->limSmeState == - eLIM_SME_WT_REASSOC_LINK_FAIL_STATE))) + + if (LIM_IS_STA_ROLE(psessionEntry) && + (psessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE)) return true; return false; diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 9007a55a56..e685ca119b 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -452,7 +452,6 @@ uint8_t *lim_trace_get_sme_state_string(uint32_t smeState) CASE_RETURN_STRING(eLIM_SME_WT_AUTH_STATE); CASE_RETURN_STRING(eLIM_SME_WT_ASSOC_STATE); CASE_RETURN_STRING(eLIM_SME_WT_REASSOC_STATE); - CASE_RETURN_STRING(eLIM_SME_WT_REASSOC_LINK_FAIL_STATE); CASE_RETURN_STRING(eLIM_SME_JOIN_FAILURE_STATE); CASE_RETURN_STRING(eLIM_SME_ASSOCIATED_STATE); CASE_RETURN_STRING(eLIM_SME_REASSOCIATED_STATE); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index e46fe3b367..c6958f78f9 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -235,8 +235,6 @@ char *lim_sme_state_str(tLimSmeStates state) return "eLIM_SME_WT_ASSOC_STATE"; case eLIM_SME_WT_REASSOC_STATE: return "eLIM_SME_WT_REASSOC_STATE"; - case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: - return "eLIM_SME_WT_REASSOC_LINK_FAIL_STATE"; case eLIM_SME_JOIN_FAILURE_STATE: return "eLIM_SME_JOIN_FAILURE_STATE"; case eLIM_SME_ASSOCIATED_STATE: 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 79cd5ef884..81dce6a323 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 @@ -154,7 +154,6 @@ uint8_t *mac_trace_get_lim_sme_state(uint16_t lim_state) CASE_RETURN_STRING(eLIM_SME_WT_AUTH_STATE); CASE_RETURN_STRING(eLIM_SME_WT_ASSOC_STATE); CASE_RETURN_STRING(eLIM_SME_WT_REASSOC_STATE); - CASE_RETURN_STRING(eLIM_SME_WT_REASSOC_LINK_FAIL_STATE); CASE_RETURN_STRING(eLIM_SME_JOIN_FAILURE_STATE); CASE_RETURN_STRING(eLIM_SME_ASSOCIATED_STATE); CASE_RETURN_STRING(eLIM_SME_REASSOCIATED_STATE);