aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-12-23 19:18:33 +0100
committerFelix Fietkau <nbd@nbd.name>2021-12-23 19:20:34 +0100
commitd655eea05300f37931d49077044a81dc2e1d955c (patch)
treec7aace45509c2733edb6183f42860e381f2be223 /package/network/services
parente1b79b1dc39febcfb8eb9a32123abb64b10b5524 (diff)
downloadupstream-d655eea05300f37931d49077044a81dc2e1d955c.tar.gz
upstream-d655eea05300f37931d49077044a81dc2e1d955c.tar.bz2
upstream-d655eea05300f37931d49077044a81dc2e1d955c.zip
hostapd: only attempt to set qos map if supported by the driver
Fixes issues with brcmfmac Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry-picked from commit 5e67cd63c4ff5d8f36c341dfa3355e3a4ac2be81)
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/hostapd/Makefile2
-rw-r--r--package/network/services/hostapd/patches/751-qos_map_ignore_when_unsupported.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 783c10d587..5377c940a3 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
-PKG_RELEASE:=37
+PKG_RELEASE:=38
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/patches/751-qos_map_ignore_when_unsupported.patch b/package/network/services/hostapd/patches/751-qos_map_ignore_when_unsupported.patch
new file mode 100644
index 0000000000..8af5a0a046
--- /dev/null
+++ b/package/network/services/hostapd/patches/751-qos_map_ignore_when_unsupported.patch
@@ -0,0 +1,12 @@
+--- a/src/ap/ap_drv_ops.c
++++ b/src/ap/ap_drv_ops.c
+@@ -850,7 +850,8 @@ int hostapd_start_dfs_cac(struct hostapd
+ int hostapd_drv_set_qos_map(struct hostapd_data *hapd,
+ const u8 *qos_map_set, u8 qos_map_set_len)
+ {
+- if (!hapd->driver || !hapd->driver->set_qos_map || !hapd->drv_priv)
++ if (!hapd->driver || !hapd->driver->set_qos_map || !hapd->drv_priv ||
++ !(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_QOS_MAPPING))
+ return 0;
+ return hapd->driver->set_qos_map(hapd->drv_priv, qos_map_set,
+ qos_map_set_len);