DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

mesh: Allow DFS channels to be selected if dfs is enabled

Browse source 
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>
This commit is contained in:
Peter Oh 2020-06-30 14:18:58 +02:00 • committed by sinavir
parent ba99627140
commit 945aea6ff0
No known key found for this signature in database
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
wpa_supplicant/wpa_supplicant.c
View file

@ -2831,7 +2831,7 @@ static int drv_supports_vht(struct wpa_supplicant *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; int i;
@ -2840,7 +2840,10 @@ static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode)
chan = hw_get_channel_chan(mode, i, NULL); chan = hw_get_channel_chan(mode, i, NULL);
if (!chan || 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; return false;
} }
@ -2967,7 +2970,7 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid, const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode, struct hostapd_hw_modes *mode,
struct hostapd_freq_params *freq, struct hostapd_freq_params *freq,
int obss_scan) { int obss_scan, bool dfs_enabled) {
int chan_idx; int chan_idx;
struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL; struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
int i, res; int i, res;
@ -2991,7 +2994,10 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
return; return;
/* Check primary channel flags */ /* 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; return;
#ifdef CONFIG_HT_OVERRIDES #ifdef CONFIG_HT_OVERRIDES
@ -3018,7 +3024,10 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
return; return;
/* Check secondary channel flags */ /* 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; return;
if (ht40 == -1) { if (ht40 == -1) {
@ -3074,7 +3083,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
const struct wpa_ssid *ssid, const struct wpa_ssid *ssid,
struct hostapd_hw_modes *mode, struct hostapd_hw_modes *mode,
struct hostapd_freq_params *freq, struct hostapd_freq_params *freq,
int ieee80211_mode, bool is_6ghz) { int ieee80211_mode, bool is_6ghz, bool dfs_enabled) {
static const int bw80[] = { static const int bw80[] = {
5180, 5260, 5500, 5580, 5660, 5745, 5825, 5180, 5260, 5500, 5580, 5660, 5745, 5825,
5955, 6035, 6115, 6195, 6275, 6355, 6435, 5955, 6035, 6115, 6195, 6275, 6355, 6435,
@ -3119,7 +3128,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
goto skip_80mhz; goto skip_80mhz;
/* Use 40 MHz if channel not usable */ /* 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; goto skip_80mhz;
chwidth = CONF_OPER_CHWIDTH_80MHZ; chwidth = CONF_OPER_CHWIDTH_80MHZ;
@ -3133,7 +3142,7 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
if ((mode->he_capab[ieee80211_mode].phy_cap[ if ((mode->he_capab[ieee80211_mode].phy_cap[
HE_PHYCAP_CHANNEL_WIDTH_SET_IDX] & HE_PHYCAP_CHANNEL_WIDTH_SET_IDX] &
HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && is_6ghz && HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && is_6ghz &&
ibss_mesh_is_80mhz_avail(channel + 16, mode)) { ibss_mesh_is_80mhz_avail(channel + 16, mode, dfs_enabled)) {
for (j = 0; j < ARRAY_SIZE(bw160); j++) { for (j = 0; j < ARRAY_SIZE(bw160); j++) {
if (freq->freq == bw160[j]) { if (freq->freq == bw160[j]) {
chwidth = CONF_OPER_CHWIDTH_160MHZ; chwidth = CONF_OPER_CHWIDTH_160MHZ;
@ -3161,9 +3170,11 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
if (!chan) if (!chan)
continue; continue;
if (chan->flag & (HOSTAPD_CHAN_DISABLED | if (chan->flag & HOSTAPD_CHAN_DISABLED)
HOSTAPD_CHAN_NO_IR | continue;
HOSTAPD_CHAN_RADAR)) if (chan->flag & (HOSTAPD_CHAN_RADAR |
HOSTAPD_CHAN_NO_IR))
if (!dfs_enabled)
continue; continue;
/* Found a suitable second segment for 80+80 */ /* Found a suitable second segment for 80+80 */
@ -3219,6 +3230,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
int obss_scan = 1; int obss_scan = 1;
u8 channel; u8 channel;
bool is_6ghz, is_24ghz; 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; freq->freq = ssid->frequency;
@ -3261,9 +3273,9 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
freq->channel = channel; freq->channel = channel;
/* Setup higher BW only for 5 GHz */ /* Setup higher BW only for 5 GHz */
if (mode->mode == HOSTAPD_MODE_IEEE80211A) { if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan); ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
if (!ibss_mesh_select_80_160mhz(wpa_s, ssid, mode, freq, 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; freq->he_enabled = freq->vht_enabled = false;
} }