blob: dd121cabed5d502e1064484197f272e1237bfd58 [file] [log] [blame]
developer2a209692023-08-14 20:23:42 +08001From 76e54b095fdd8ab65a562c28fba330afcfb519ec Mon Sep 17 00:00:00 2001
2From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
3Date: Wed, 5 Jul 2023 10:44:15 +0800
4Subject: [PATCH] hostapd: mtk: Fix background channel overlapping operating
5 channel issue
6
7Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
8---
9 src/ap/dfs.c | 18 ++++++++++++++++++
10 1 file changed, 18 insertions(+)
11
12diff --git a/src/ap/dfs.c b/src/ap/dfs.c
13index 2f5c86e..c9a9c6c 100644
14--- a/src/ap/dfs.c
15+++ b/src/ap/dfs.c
16@@ -807,6 +807,20 @@ static int dfs_are_channels_overlapped(struct hostapd_iface *iface, int freq,
17 }
18
19
20+static void dfs_check_background_overlapped(struct hostapd_iface *iface)
21+{
22+ int width = hostapd_get_oper_chwidth(iface->conf);
23+
24+ if (!dfs_use_radar_background(iface))
25+ return;
26+
27+ if (dfs_are_channels_overlapped(iface, iface->radar_background.freq,
28+ width, iface->radar_background.centr_freq_seg0_idx,
29+ iface->radar_background.centr_freq_seg1_idx))
30+ iface->radar_background.channel = -1;
31+}
32+
33+
34 static unsigned int dfs_get_cac_time(struct hostapd_iface *iface,
35 int start_chan_idx, int n_chans)
36 {
37@@ -1127,6 +1141,8 @@ static void hostpad_dfs_update_background_chain(struct hostapd_iface *iface)
38 &oper_centr_freq_seg1_idx,
39 &channel_type);
40 if (!channel ||
41+ channel->chan == iface->conf->channel ||
42+ channel->chan == iface->radar_background.channel ||
43 hostapd_start_dfs_cac(iface, iface->conf->hw_mode,
44 channel->freq, channel->chan,
45 iface->conf->ieee80211n,
46@@ -1361,6 +1377,7 @@ static int hostapd_dfs_start_channel_switch_cac(struct hostapd_iface *iface)
47 hostapd_set_oper_centr_freq_seg1_idx(iface->conf,
48 oper_centr_freq_seg1_idx);
49 err = 0;
50+ dfs_check_background_overlapped(iface);
51
52 hostapd_setup_interface_complete(iface, err);
53 return err;
54@@ -1488,6 +1505,7 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface)
55 hostapd_set_oper_centr_freq_seg1_idx(
56 iface->conf, oper_centr_freq_seg1_idx);
57
58+ dfs_check_background_overlapped(iface);
59 hostapd_disable_iface(iface);
60 hostapd_enable_iface(iface);
61 return 0;
62--
632.18.0
64