blob: 5b14a771a0a10500ca8f1d572461018cc80aba0b [file] [log] [blame]
developer00c6c7a2023-04-29 06:26:42 +08001From c229d874452a61f58b65473d26b89c64b4693908 Mon Sep 17 00:00:00 2001
developer757b5622023-03-02 18:27:32 +08002From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
developer00c6c7a2023-04-29 06:26:42 +08003Date: Sat, 29 Apr 2023 06:57:36 +0800
4Subject: [PATCH 20/29] hostapd: mtk: Mark DFS channel as available for CSA.
developer757b5622023-03-02 18:27:32 +08005
6---
7 hostapd/ctrl_iface.c | 10 ++++++++++
8 hostapd/hostapd_cli.c | 2 +-
9 src/ap/ctrl_iface_ap.c | 1 +
10 3 files changed, 12 insertions(+), 1 deletion(-)
11
12diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
developer00c6c7a2023-04-29 06:26:42 +080013index 06cbea1..7b59bb5 100644
developer757b5622023-03-02 18:27:32 +080014--- a/hostapd/ctrl_iface.c
15+++ b/hostapd/ctrl_iface.c
developer00c6c7a2023-04-29 06:26:42 +080016@@ -2705,6 +2705,16 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
17 settings.freq_params.eht_enabled = iface->conf->ieee80211be;
developer757b5622023-03-02 18:27:32 +080018 }
19
20+ if (settings.freq_params.radar_background) {
21+ hostapd_dfs_sta_update_state(iface,
22+ settings.freq_params.freq,
23+ settings.freq_params.ht_enabled,
24+ settings.freq_params.sec_channel_offset,
25+ bandwidth, settings.freq_params.center_freq1,
26+ settings.freq_params.center_freq2,
27+ HOSTAPD_CHAN_DFS_AVAILABLE);
28+ }
29+
30 if (settings.freq_params.center_freq1)
31 dfs_range += hostapd_is_dfs_overlap(
32 iface, bandwidth, settings.freq_params.center_freq1);
33diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
34index 0da18e2..6231e51 100644
35--- a/hostapd/hostapd_cli.c
36+++ b/hostapd/hostapd_cli.c
37@@ -1693,7 +1693,7 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
38 "<addr> = send QoS Map Configure frame" },
39 { "chan_switch", hostapd_cli_cmd_chan_switch, NULL,
40 "<cs_count> <freq> [sec_channel_offset=] [center_freq1=]\n"
41- " [center_freq2=] [bandwidth=] [blocktx] [ht|vht]\n"
42+ " [center_freq2=] [bandwidth=] [blocktx] [ht|vht] [skip_cac]\n"
43 " = initiate channel switch announcement" },
44 { "hs20_wnm_notif", hostapd_cli_cmd_hs20_wnm_notif, NULL,
45 "<addr> <url>\n"
46diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
47index 18bae5c..2fae590 100644
48--- a/src/ap/ctrl_iface_ap.c
49+++ b/src/ap/ctrl_iface_ap.c
50@@ -938,6 +938,7 @@ int hostapd_parse_csa_settings(const char *pos,
51 settings->freq_params.vht_enabled = !!os_strstr(pos, " vht");
52 settings->freq_params.he_enabled = !!os_strstr(pos, " he");
53 settings->freq_params.eht_enabled = !!os_strstr(pos, " eht");
54+ settings->freq_params.radar_background = !!os_strstr(pos, " skip_cac");
55 settings->block_tx = !!os_strstr(pos, " blocktx");
56 #undef SET_CSA_SETTING
57
58--
592.18.0
60