2020-07-23 17:34:00 +00:00
|
|
|
From 8de8cd8380af0c43d4fde67a668d79ef73b26b26 Mon Sep 17 00:00:00 2001
|
2020-05-21 09:15:46 +00:00
|
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
2020-07-23 17:34:00 +00:00
|
|
|
Date: Tue, 30 Jun 2020 14:18:58 +0200
|
|
|
|
Subject: [PATCH 10/19] mesh: Allow DFS channels to be selected if dfs is
|
|
|
|
enabled
|
2020-05-21 09:15:46 +00:00
|
|
|
|
|
|
|
Note: DFS is assumed to be usable if a country code has been set
|
|
|
|
|
|
|
|
Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
|
|
|
|
Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
|
|
|
|
---
|
2020-07-23 17:34:00 +00:00
|
|
|
wpa_supplicant/wpa_supplicant.c | 25 +++++++++++++++++++------
|
|
|
|
1 file changed, 19 insertions(+), 6 deletions(-)
|
2020-05-21 09:15:46 +00:00
|
|
|
|
|
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
2022-01-17 19:57:04 +00:00
|
|
|
@@ -2409,7 +2409,7 @@ static int drv_supports_vht(struct wpa_s
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
|
|
|
|
+static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode, bool dfs_enabled)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
@@ -2418,7 +2418,10 @@ static bool ibss_mesh_is_80mhz_avail(int
|
|
|
|
|
|
|
|
chan = hw_get_channel_chan(mode, i, NULL);
|
|
|
|
if (!chan ||
|
|
|
|
- chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
|
|
|
+ chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
+ return false;
|
|
|
|
+
|
|
|
|
+ if (!dfs_enabled && chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2447,6 +2450,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
2020-05-21 09:15:46 +00:00
|
|
|
int chwidth, seg0, seg1;
|
|
|
|
u32 vht_caps = 0;
|
2022-01-17 19:57:04 +00:00
|
|
|
bool is_24ghz, is_6ghz;
|
|
|
|
+ bool dfs_enabled = wpa_s->conf->country[0] &&
|
|
|
|
+ (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
|
2020-05-21 09:15:46 +00:00
|
|
|
|
|
|
|
freq->freq = ssid->frequency;
|
|
|
|
|
2022-01-17 19:57:04 +00:00
|
|
|
@@ -2543,8 +2548,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
2020-05-21 09:15:46 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Check primary channel flags */
|
|
|
|
- if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
|
|
|
+ if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
return;
|
|
|
|
+ if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
|
|
|
|
+ if (!dfs_enabled)
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
freq->channel = pri_chan->chan;
|
|
|
|
|
2022-01-17 19:57:04 +00:00
|
|
|
@@ -2577,8 +2585,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
2020-05-21 09:15:46 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Check secondary channel flags */
|
|
|
|
- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
|
|
|
+ if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
return;
|
|
|
|
+ if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
|
|
|
|
+ if (!dfs_enabled)
|
|
|
|
+ return;
|
|
|
|
|
|
|
|
if (ht40 == -1) {
|
|
|
|
if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
|
2022-01-17 19:57:04 +00:00
|
|
|
@@ -2667,7 +2678,7 @@ skip_to_6ghz:
|
|
|
|
return;
|
2020-05-21 09:15:46 +00:00
|
|
|
|
2022-01-17 19:57:04 +00:00
|
|
|
/* Back to HT configuration if channel not usable */
|
|
|
|
- if (!ibss_mesh_is_80mhz_avail(channel, mode))
|
|
|
|
+ if (!ibss_mesh_is_80mhz_avail(channel, mode, dfs_enabled))
|
|
|
|
return;
|
2020-05-21 09:15:46 +00:00
|
|
|
|
|
|
|
chwidth = CHANWIDTH_80MHZ;
|
2022-01-17 19:57:04 +00:00
|
|
|
@@ -2681,7 +2692,7 @@ skip_to_6ghz:
|
|
|
|
* above; check the remaining four 20 MHz channels for the total
|
|
|
|
* of 160 MHz bandwidth.
|
|
|
|
*/
|
|
|
|
- if (!ibss_mesh_is_80mhz_avail(channel + 16, mode))
|
|
|
|
+ if (!ibss_mesh_is_80mhz_avail(channel + 16, mode, dfs_enabled))
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (j = 0; j < ARRAY_SIZE(bw160); j++) {
|
|
|
|
@@ -2711,10 +2722,12 @@ skip_to_6ghz:
|
2020-05-21 09:15:46 +00:00
|
|
|
if (!chan)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
- if (chan->flag & (HOSTAPD_CHAN_DISABLED |
|
|
|
|
- HOSTAPD_CHAN_NO_IR |
|
|
|
|
- HOSTAPD_CHAN_RADAR))
|
|
|
|
+ if (chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
continue;
|
2020-07-23 17:34:00 +00:00
|
|
|
+ if (chan->flag & (HOSTAPD_CHAN_RADAR |
|
|
|
|
+ HOSTAPD_CHAN_NO_IR))
|
2020-05-21 09:15:46 +00:00
|
|
|
+ if (!dfs_enabled)
|
|
|
|
+ continue;
|
|
|
|
|
|
|
|
/* Found a suitable second segment for 80+80 */
|
|
|
|
chwidth = CHANWIDTH_80P80MHZ;
|