From 968eafb3a3151bd77c0511ceaacb915fdde0d77c Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Fri, 9 Sep 2022 11:28:49 +0800 Subject: [PATCH] qcacld-3.0: Fix obss_width_trigger_interval zero in WMI command DUT roams to 2 GHz channel 6 bw 20 MHz, OBSS parameters are not initialized by lim_fill_ft_session. Later when DUT gets CSA event to 2 GHz channel 1 bw 40 MHz, the OBSS scan command will send invalid obss_width_trigger_interval with zero value to target. Fix by initialize the OBSS parameters without check current AP's BW. Change-Id: I6f895371898fde292cde5a108a3b4fcd95836186 CRs-Fixed: 3287522 --- core/mac/src/pe/lim/lim_ft.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index a66585ca24a2..0017167ac437 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -735,10 +736,8 @@ void lim_fill_ft_session(struct mac_context *mac, #ifdef WLAN_FEATURE_11W ft_session->limRmfEnabled = pe_session->limRmfEnabled; #endif - if ((ft_session->limRFBand == REG_BAND_2G) && - (ft_session->htSupportedChannelWidthSet == - eHT_CHANNEL_WIDTH_40MHZ)) - lim_init_obss_params(mac, ft_session); + /* Load default OBSS parameters to session entry */ + lim_init_obss_params(mac, ft_session); ft_session->enableHtSmps = pe_session->enableHtSmps; ft_session->htSmpsvalue = pe_session->htSmpsvalue;