diff options
| author | Deepak Dhamdhere <ddhamdhe@codeaurora.org> | 2016-09-30 16:44:44 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-01-20 11:49:24 -0800 |
| commit | 31bd157301ebf6edbaec9880214fc6d0240ebec0 (patch) | |
| tree | a790abc103e6e96cca19d3684c38d2b9bd75020c | |
| parent | 1276878dc26565c9152f97b5c1540c8b2c796871 (diff) | |
qcacld-3.0: Scan stuck when lfr enable/disable using pvt ioctl
qcacld-2.0 to qcacld-3.0 propagation
When dissassoc or deauth is issued by user a.k.a (supplicant), it has
dependency on few parameters like isFastRoamIniFeatureEnable in
cleanup path. This change removes the dependency.
Change-Id: I601e33e7e57b0ebb76fd06d3c176bfabb9568ba8
CRs-Fixed: 754116
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_management_frames.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 13bbdd0a1e7e..e1438f4d5382 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -2484,35 +2484,26 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) lim_log(mac_ctx, LOGE, FL("cleanup_rx_path error")); goto end; } - if (LIM_IS_STA_ROLE(pe_session) && ( -#ifdef FEATURE_WLAN_ESE - (pe_session->isESEconnection) || -#endif - (pe_session->isFastRoamIniFeatureEnabled) || - (pe_session->is11Rconnection)) && - (disassoc_req->reasonCode != + if (LIM_IS_STA_ROLE(pe_session) && + (disassoc_req->reasonCode != eSIR_MAC_DISASSOC_DUE_TO_FTHANDOFF_REASON)) { lim_log(mac_ctx, LOG1, - FL("FT Preauth Session (%p,%d) Clean up"), - pe_session, pe_session->peSessionId); - - /* Delete FT session if there exists one */ - lim_ft_cleanup_pre_auth_info(mac_ctx, pe_session); - } else { - lim_log(mac_ctx, LOGE, - FL("No FT Preauth Session Clean up in role %d" + FL("FT Preauth Session (%p,%d) Clean up" #ifdef FEATURE_WLAN_ESE " isESE %d" #endif " isLFR %d" " is11r %d reason %d"), - GET_LIM_SYSTEM_ROLE(pe_session), + pe_session, pe_session->peSessionId, #ifdef FEATURE_WLAN_ESE pe_session->isESEconnection, #endif pe_session->isFastRoamIniFeatureEnabled, pe_session->is11Rconnection, disassoc_req->reasonCode); + + /* Delete FT session if there exists one */ + lim_ft_cleanup_pre_auth_info(mac_ctx, pe_session); } /* Free up buffer allocated for mlmDisassocReq */ qdf_mem_free(disassoc_req); |