2ac791e87d
Manually refreshed: 140-tests-Makefile-make-run-tests-with-CONFIG_TLS.patch 601-ucode_support.patch Fixed in upstream: 804-hostapd-revert-ACS-Validate-6-GHz-AP-criteria-before.patch [1] Automatically rebased all other patches. [1] https://w1.fi/cgit/hostap/commit/?id=0b60826a66885bffa2fd709ed5e48cd5fe241b6b Signed-off-by: Agustin Lorenzo <agustin.lorenzo@thinco.es> Signed-off-by: Felix Fietkau <nbd@nbd.name>
153 lines
5.5 KiB
Diff
153 lines
5.5 KiB
Diff
From 8de8cd8380af0c43d4fde67a668d79ef73b26b26 Mon Sep 17 00:00:00 2001
|
|
From: Peter Oh <peter.oh@bowerswilkins.com>
|
|
Date: Tue, 30 Jun 2020 14:18:58 +0200
|
|
Subject: [PATCH 10/19] mesh: Allow DFS channels to be selected if dfs is
|
|
enabled
|
|
|
|
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>
|
|
---
|
|
wpa_supplicant/wpa_supplicant.c | 38 ++++++++++++++++++++++-----------
|
|
1 file changed, 25 insertions(+), 13 deletions(-)
|
|
|
|
--- a/wpa_supplicant/wpa_supplicant.c
|
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
|
@@ -2974,7 +2974,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;
|
|
|
|
@@ -2983,7 +2983,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;
|
|
}
|
|
|
|
@@ -3110,7 +3113,7 @@ static void ibss_mesh_select_40mhz(struc
|
|
const struct wpa_ssid *ssid,
|
|
struct hostapd_hw_modes *mode,
|
|
struct hostapd_freq_params *freq,
|
|
- int obss_scan, bool is_6ghz)
|
|
+ int obss_scan, bool is_6ghz, bool dfs_enabled)
|
|
{
|
|
int chan_idx;
|
|
struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
|
|
@@ -3141,8 +3144,11 @@ static void ibss_mesh_select_40mhz(struc
|
|
return;
|
|
|
|
/* Check primary channel flags */
|
|
- if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
|
- return;
|
|
+ if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
+ return;
|
|
+ if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
|
|
+ if (!dfs_enabled)
|
|
+ return;
|
|
|
|
#ifdef CONFIG_HT_OVERRIDES
|
|
if (ssid->disable_ht40)
|
|
@@ -3177,8 +3183,11 @@ static void ibss_mesh_select_40mhz(struc
|
|
return;
|
|
|
|
/* Check secondary channel flags */
|
|
- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
|
- return;
|
|
+ if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
+ return;
|
|
+ if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
|
|
+ if (!dfs_enabled)
|
|
+ return;
|
|
|
|
if (freq->ht_enabled) {
|
|
if (ht40 == -1) {
|
|
@@ -3256,7 +3265,7 @@ static bool ibss_mesh_select_80_160mhz(s
|
|
const struct wpa_ssid *ssid,
|
|
struct hostapd_hw_modes *mode,
|
|
struct hostapd_freq_params *freq,
|
|
- int ieee80211_mode, bool is_6ghz) {
|
|
+ int ieee80211_mode, bool is_6ghz, bool dfs_enabled) {
|
|
static const int bw80[] = {
|
|
5180, 5260, 5500, 5580, 5660, 5745, 5825,
|
|
5955, 6035, 6115, 6195, 6275, 6355, 6435,
|
|
@@ -3309,7 +3318,7 @@ static bool ibss_mesh_select_80_160mhz(s
|
|
goto skip_80mhz;
|
|
|
|
/* Use 40 MHz if channel not usable */
|
|
- if (!ibss_mesh_is_80mhz_avail(channel, mode))
|
|
+ if (!ibss_mesh_is_80mhz_avail(channel, mode, dfs_enabled))
|
|
goto skip_80mhz;
|
|
|
|
chwidth = CONF_OPER_CHWIDTH_80MHZ;
|
|
@@ -3351,7 +3360,7 @@ static bool ibss_mesh_select_80_160mhz(s
|
|
HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) &&
|
|
(ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_160MHZ ||
|
|
ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_320MHZ) &&
|
|
- ibss_mesh_is_80mhz_avail(channel + 16 * offset_in_160, mode)) {
|
|
+ ibss_mesh_is_80mhz_avail(channel + 16 * offset_in_160, mode, dfs_enabled)) {
|
|
for (j = 0; j < ARRAY_SIZE(bw160); j++) {
|
|
u8 start_chan;
|
|
|
|
@@ -3374,11 +3383,11 @@ static bool ibss_mesh_select_80_160mhz(s
|
|
EHT_PHYCAP_320MHZ_IN_6GHZ_SUPPORT_MASK) && is_6ghz &&
|
|
ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_320MHZ &&
|
|
ibss_mesh_is_80mhz_avail(channel + 16 -
|
|
- 64 * ((offset_in_320 + 1) / 4), mode) &&
|
|
+ 64 * ((offset_in_320 + 1) / 4), mode, dfs_enabled) &&
|
|
ibss_mesh_is_80mhz_avail(channel + 32 -
|
|
- 64 * ((offset_in_320 + 2) / 4), mode) &&
|
|
+ 64 * ((offset_in_320 + 2) / 4), mode, dfs_enabled) &&
|
|
ibss_mesh_is_80mhz_avail(channel + 48 -
|
|
- 64 * ((offset_in_320 + 3) / 4), mode)) {
|
|
+ 64 * ((offset_in_320 + 3) / 4), mode, dfs_enabled)) {
|
|
for (j = 0; j < ARRAY_SIZE(bw320); j += 2) {
|
|
if (freq->freq >= bw320[j] &&
|
|
freq->freq <= bw320[j + 1]) {
|
|
@@ -3407,10 +3416,12 @@ static bool ibss_mesh_select_80_160mhz(s
|
|
if (!chan)
|
|
continue;
|
|
|
|
- if (chan->flag & (HOSTAPD_CHAN_DISABLED |
|
|
- HOSTAPD_CHAN_NO_IR |
|
|
- HOSTAPD_CHAN_RADAR))
|
|
- continue;
|
|
+ if (chan->flag & HOSTAPD_CHAN_DISABLED)
|
|
+ continue;
|
|
+ if (chan->flag & (HOSTAPD_CHAN_RADAR |
|
|
+ HOSTAPD_CHAN_NO_IR))
|
|
+ if (!dfs_enabled)
|
|
+ continue;
|
|
|
|
/* Found a suitable second segment for 80+80 */
|
|
chwidth = CONF_OPER_CHWIDTH_80P80MHZ;
|
|
@@ -3465,6 +3476,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
|
int obss_scan = 1;
|
|
u8 channel;
|
|
bool is_6ghz, is_24ghz;
|
|
+ bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
|
|
|
|
freq->freq = ssid->frequency;
|
|
|
|
@@ -3508,9 +3520,9 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
|
/* Setup higher BW only for 5 and 6 GHz */
|
|
if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
|
|
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan,
|
|
- is_6ghz);
|
|
+ is_6ghz, dfs_enabled);
|
|
if (!ibss_mesh_select_80_160mhz(wpa_s, ssid, mode, freq,
|
|
- ieee80211_mode, is_6ghz))
|
|
+ ieee80211_mode, is_6ghz, dfs_enabled))
|
|
freq->he_enabled = freq->vht_enabled = false;
|
|
}
|
|
|