aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-11-08 16:48:57 +0100
committerChristian Marangi <ansuelsmth@gmail.com>2023-11-09 16:10:26 +0100
commit85d1b43be4efc588da64f3266c1788131ea42a0d (patch)
treed73f7a8ecde9b08b3f0c0030749e47ea5c74cddc
parent1cab0d74b3c56fa99cc0fcf6dcd13aff7cb174ba (diff)
downloadupstream-85d1b43be4efc588da64f3266c1788131ea42a0d.tar.gz
upstream-85d1b43be4efc588da64f3266c1788131ea42a0d.tar.bz2
upstream-85d1b43be4efc588da64f3266c1788131ea42a0d.zip
hostapd: permit 40MHz in 802.1s only also for 2.4GHz g/n with noscan
Currently for 802.1s only, for wifi 2.4GHz in g/n mode, 40MHz is never permitted. This is probably due to the complexity of setting periodic check for the intolerant bit. When noscan option is set, we ignore the presence of the intoleran bit in near AP, so we can enable 40MHz and ignore any complex logic for checking. Fixes: #13112 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 6c9ac57d58ab0d2c71fb51120a2166b7e0bd7183)
-rw-r--r--package/network/services/hostapd/patches/301-mesh-noscan.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/package/network/services/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch
index c50ffa8490..ceb6d0c161 100644
--- a/package/network/services/hostapd/patches/301-mesh-noscan.patch
+++ b/package/network/services/hostapd/patches/301-mesh-noscan.patch
@@ -58,6 +58,15 @@
u8 channel;
bool is_6ghz;
bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
+@@ -3080,6 +3080,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
+ freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
+ ieee80211_mode);
+ freq->channel = channel;
++ if (mode->mode == HOSTAPD_MODE_IEEE80211G && ssid->noscan)
++ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
+ /* Setup higher BW only for 5 GHz */
+ if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
+ ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -1035,6 +1035,8 @@ struct wpa_ssid {