From 45441debcbdbcecee6364aac824984a3b59c14c9 Mon Sep 17 00:00:00 2001 From: Adesh Keremane Date: Fri, 4 Nov 2016 14:56:12 +0530 Subject: qcacld-2.0: Modify ROAM_LOSTLINK_DETECTED for deauth and disassoc Handling of ROAM_LOSTLINK_DETECTED should be only for deauth and disassoc indication. This handling should not interface with fall through of ROAM_LOSTLINK. Fix this by reordering the case statements. Change-Id: I11a6427d0c35cb6247e57950a7e35e92a778978e CRs-Fixed: 1086046 --- CORE/HDD/src/wlan_hdd_assoc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index d1761ef223b1..c639bf1e5f4a 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -4005,6 +4005,11 @@ hdd_smeRoamCallback(void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, #endif } break; + case eCSR_ROAM_LOSTLINK_DETECTED: + if((roamResult != eCSR_ROAM_RESULT_DISASSOC_IND) && + (roamResult != eCSR_ROAM_RESULT_DEAUTH_IND)) { + break; + } /* else fall through */ case eCSR_ROAM_LOSTLINK: if(roamResult == eCSR_ROAM_RESULT_LOSTLINK) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, @@ -4015,10 +4020,6 @@ hdd_smeRoamCallback(void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U32 roamId, WLAN_CONTROL_PATH); break; } - case eCSR_ROAM_LOSTLINK_DETECTED: - if(roamResult != eCSR_ROAM_RESULT_DISASSOC_IND) { - break; - } /* else fall through */ case eCSR_ROAM_DISASSOCIATED: { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, -- cgit v1.2.3