From fae5010b10975789e7586fb28f778eae22424b7f Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 17 Aug 2016 19:05:01 -0700 Subject: [PATCH] qcacld-3.0: Handle disassociate reason code 34 and cleanup logs This is a qcacld-2.0 to qcacld-3.0 propagation. Currently code honors disconnect reason code 34 but still log shows up as invalid reason code. 34 is a valid 802.11 reason code. Add eSIR_MAC_XS_UNACKED_FRAMES_REASON and clean up logs. Change-Id: I32fb804792dd67dd31824a5387e4ecb419656420 CRs-Fixed: 1015244 --- .../src/pe/lim/lim_process_disassoc_frame.c | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c index 80a06c80bac2..b90b1ed11cea 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -266,20 +266,6 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, (psessionEntry->limSmeState != eLIM_SME_WT_ASSOC_STATE) && (psessionEntry->limSmeState != eLIM_SME_WT_REASSOC_STATE))) { switch (reasonCode) { - case eSIR_MAC_UNSPEC_FAILURE_REASON: - case eSIR_MAC_DISASSOC_DUE_TO_INACTIVITY_REASON: - case eSIR_MAC_DISASSOC_DUE_TO_DISABILITY_REASON: - case eSIR_MAC_CLASS2_FRAME_FROM_NON_AUTH_STA_REASON: - case eSIR_MAC_CLASS3_FRAME_FROM_NON_ASSOC_STA_REASON: - case eSIR_MAC_MIC_FAILURE_REASON: - case eSIR_MAC_4WAY_HANDSHAKE_TIMEOUT_REASON: - case eSIR_MAC_GR_KEY_UPDATE_TIMEOUT_REASON: - case eSIR_MAC_RSN_IE_MISMATCH_REASON: - case eSIR_MAC_1X_AUTH_FAILURE_REASON: - case eSIR_MAC_PREV_AUTH_NOT_VALID_REASON: - /* Valid reasonCode in received Disassociation frame */ - break; - case eSIR_MAC_DEAUTH_LEAVING_BSS_REASON: case eSIR_MAC_DISASSOC_LEAVING_BSS_REASON: /* Valid reasonCode in received Disassociation frame */ @@ -297,15 +283,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, break; default: - /* Invalid reasonCode in received Disassociation frame */ - /* Log error and ignore the frame */ - PELOGE(lim_log(pMac, LOGE, - FL - ("received Disassoc frame with invalid reasonCode " - "%d from " MAC_ADDRESS_STR), reasonCode, - MAC_ADDR_ARRAY(pHdr->sa)); - ) - return; + break; } } else { /* Received Disassociation frame in either IBSS */