From 439682ddbd131accd4fd0eb7e049e6ff55f8e872 Mon Sep 17 00:00:00 2001 From: Zhu Jianmin Date: Mon, 26 Feb 2018 15:09:59 +0800 Subject: [PATCH] qcacld-3.0: Fix LFR2 roam on same channel fail When LFR2 roaming on same channel, after pre-auth resp received, A new PE session is created, currentOperChannel is 0 before lim_fill_ft_session, not same as currentOperChannel of original session, so lim_is_in_mcc return true, pre-auth auth result is not sent to SME/CSR for lim_ft_process_pre_auth_result isn't called in lim_handle_ft_pre_auth_rsp Change-Id: If8686c7f73c76655f7ab69c23fb97a7bb540732f CRs-Fixed: 2195749 --- core/mac/src/pe/lim/lim_session_utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_session_utils.c b/core/mac/src/pe/lim/lim_session_utils.c index 1b39f85328fb..ecdc7e2af261 100644 --- a/core/mac/src/pe/lim/lim_session_utils.c +++ b/core/mac/src/pe/lim/lim_session_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -115,6 +115,8 @@ uint8_t lim_is_in_mcc(tpAniSirGlobal mac_ctx) if ((mac_ctx->lim.gpSession[i].valid)) { curr_oper_channel = mac_ctx->lim.gpSession[i].currentOperChannel; + if (curr_oper_channel == 0) + continue; if (chan == 0) chan = curr_oper_channel; else if (chan != curr_oper_channel)