blob: ea435856e3a18c56a4289830640c6a64cbe776af [file] [log] [blame]
developer27057f82023-07-10 17:23:13 +08001From cf17d8510dd96dc092b73236b6e74d8ea1c5990c Mon Sep 17 00:00:00 2001
developer683be522023-05-11 14:24:50 +08002From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
3Date: Mon, 20 Feb 2023 16:58:20 +0800
developer27057f82023-07-10 17:23:13 +08004Subject: [PATCH 18/32] hostapd: mtk: Fix auto ht issue when switching to DFS
5 channel
developer683be522023-05-11 14:24:50 +08006
7Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
8---
developer40912902023-06-09 10:29:18 +08009 hostapd/ctrl_iface.c | 13 +++++++------
10 1 file changed, 7 insertions(+), 6 deletions(-)
developer683be522023-05-11 14:24:50 +080011
12diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
developer27057f82023-07-10 17:23:13 +080013index ed17211e0..f89bb58f1 100644
developer683be522023-05-11 14:24:50 +080014--- a/hostapd/ctrl_iface.c
15+++ b/hostapd/ctrl_iface.c
developer27057f82023-07-10 17:23:13 +080016@@ -2808,6 +2808,13 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
developer683be522023-05-11 14:24:50 +080017 break;
18 }
19
20+ if (os_strstr(pos, " auto-ht")) {
21+ settings.freq_params.ht_enabled = iface->conf->ieee80211n;
22+ settings.freq_params.vht_enabled = iface->conf->ieee80211ac;
23+ settings.freq_params.he_enabled = iface->conf->ieee80211ax;
developer40912902023-06-09 10:29:18 +080024+ settings.freq_params.eht_enabled = iface->conf->ieee80211be;
developer683be522023-05-11 14:24:50 +080025+ }
26+
27 if (settings.freq_params.center_freq1)
28 dfs_range += hostapd_is_dfs_overlap(
29 iface, bandwidth, settings.freq_params.center_freq1);
developer27057f82023-07-10 17:23:13 +080030@@ -2845,12 +2852,6 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
developer683be522023-05-11 14:24:50 +080031 return 0;
32 }
33
34- if (os_strstr(pos, " auto-ht")) {
35- settings.freq_params.ht_enabled = iface->conf->ieee80211n;
36- settings.freq_params.vht_enabled = iface->conf->ieee80211ac;
37- settings.freq_params.he_enabled = iface->conf->ieee80211ax;
38- }
39-
40 for (i = 0; i < iface->num_bss; i++) {
41
42 /* Save CHAN_SWITCH VHT, HE, and EHT config */
43--
developer27057f82023-07-10 17:23:13 +0800442.39.2
developer683be522023-05-11 14:24:50 +080045