From 3e72b33bf0448b2fc5981d0177ef69befe5a6d96 Mon Sep 17 00:00:00 2001 From: Amruta Kulkarni Date: Tue, 21 Jan 2020 11:08:10 -0800 Subject: [PATCH] qcacld-3.0: Fix to not set HT/VHT flag for 6ghz scan During 6ghz scan, host should not set HT/VHT flag when sending configuration to FW via WMI_SCAN_CHAN_LIST_CMDID. Change-Id: I5a58c775f173e90f91f6e7472ced3d59adfd8f73 CRs-Fixed: 2605744 --- core/wma/src/wma_scan_roam.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 2811e1b07db3..9dfc9541ece6 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -178,11 +178,13 @@ QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, chan_p->allow_vht = 1; } else { chan_p->phy_mode = MODE_11A; - if (chan_list->vht_en) + if (chan_list->vht_en && + !(WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_p->mhz))) chan_p->allow_vht = 1; } - if (chan_list->ht_en) + if (chan_list->ht_en && + !(WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_p->mhz))) chan_p->allow_ht = 1; if (chan_list->he_en)