From d655eea05300f37931d49077044a81dc2e1d955c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 23 Dec 2021 19:18:33 +0100 Subject: [PATCH] hostapd: only attempt to set qos map if supported by the driver Fixes issues with brcmfmac Signed-off-by: Felix Fietkau (cherry-picked from commit 5e67cd63c4ff5d8f36c341dfa3355e3a4ac2be81) --- package/network/services/hostapd/Makefile | 2 +- .../751-qos_map_ignore_when_unsupported.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 package/network/services/hostapd/patches/751-qos_map_ignore_when_unsupported.patch 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); -- 2.30.2