| developer | 8eb72a3 | 2023-03-30 08:32:07 +0800 | [diff] [blame^] | 1 | From 4af041067217532a51ba7e1061b9fa7a61d60eb2 Mon Sep 17 00:00:00 2001 |
| developer | 757b562 | 2023-03-02 18:27:32 +0800 | [diff] [blame] | 2 | From: "himanshu.goyal" <himanshu.goyal@mediatek.com> |
| 3 | Date: Fri, 3 Mar 2023 12:45:42 +0800 |
| developer | 8eb72a3 | 2023-03-30 08:32:07 +0800 | [diff] [blame^] | 4 | Subject: [PATCH 20/25] hostapd: mtk: Mark DFS channel as available for CSA. |
| developer | 757b562 | 2023-03-02 18:27:32 +0800 | [diff] [blame] | 5 | |
| 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 | |
| 12 | diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c |
| 13 | index c33b7a4..9ba6992 100644 |
| 14 | --- a/hostapd/ctrl_iface.c |
| 15 | +++ b/hostapd/ctrl_iface.c |
| 16 | @@ -2704,6 +2704,16 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface, |
| 17 | settings.freq_params.he_enabled = iface->conf->ieee80211ax; |
| 18 | } |
| 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); |
| 33 | diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c |
| 34 | index 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" |
| 46 | diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c |
| 47 | index 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 | -- |
| 59 | 2.18.0 |
| 60 | |