From 79d4323faf5c14f9a4a8e0cf3219582210463206 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Mon, 20 Feb 2023 11:01:18 +0800
Subject: [PATCH 044/104] mtk: hostapd: Fix sending wrong VHT operation IE in
 CSA while using ZWDFS

Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
 src/ap/dfs.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/ap/dfs.c b/src/ap/dfs.c
index 44f3a2cb1..c703d2fb8 100644
--- a/src/ap/dfs.c
+++ b/src/ap/dfs.c
@@ -1129,6 +1129,14 @@ static int
 hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
 {
 	u8 current_vht_oper_chwidth = hostapd_get_oper_chwidth(iface->conf);
+	int ret;
+
+	ret = hostapd_dfs_request_channel_switch(iface, iface->radar_background.channel,
+						 iface->radar_background.freq,
+						 iface->radar_background.secondary_channel,
+						 current_vht_oper_chwidth,
+						 iface->radar_background.centr_freq_seg0_idx,
+						 iface->radar_background.centr_freq_seg1_idx);
 
 	iface->conf->channel = iface->radar_background.channel;
 	iface->freq = iface->radar_background.freq;
@@ -1141,11 +1149,7 @@ hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface)
 
 	hostapd_dfs_update_background_chain(iface);
 
-	return hostapd_dfs_request_channel_switch(
-		iface, iface->conf->channel, iface->freq,
-		iface->conf->secondary_channel, current_vht_oper_chwidth,
-		hostapd_get_oper_centr_freq_seg0_idx(iface->conf),
-		hostapd_get_oper_centr_freq_seg1_idx(iface->conf));
+	return ret;
 }
 
 
-- 
2.39.2