aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-10-20 21:13:10 +0200
committerFelix Fietkau <nbd@nbd.name>2021-10-21 11:31:53 +0200
commitda4be02fcd5d642954b1c9d9855d9e8d1e6205f4 (patch)
treebc76fa1fc6f282e980c04e0c8d65eb6d1ac82197 /package/network/services/hostapd/files
parentf448c2692315d379ce98c9ca21641a02c1f558d0 (diff)
downloadupstream-da4be02fcd5d642954b1c9d9855d9e8d1e6205f4.tar.gz
upstream-da4be02fcd5d642954b1c9d9855d9e8d1e6205f4.tar.bz2
upstream-da4be02fcd5d642954b1c9d9855d9e8d1e6205f4.zip
hostapd: fix a race condition on adding AP mode wds sta interfaces
Both hostapd and netifd attempt to add a VLAN device to a bridge. Depending on which one wins the race, bridge vlan settings might be incomplete, or hostapd might run into an error and refuse to service the client. Fix this by preventing hostapd from adding interfaces to the bridge and instead rely entirely on netifd handling this properly Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/hostapd/files')
-rw-r--r--package/network/services/hostapd/files/hostapd.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 4f306317c7..443511f75b 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -753,7 +753,7 @@ hostapd_set_bss_options() {
}
append bss_conf "ssid=$ssid" "$N"
- [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
+ [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge${N}wds_bridge=" "$N"
[ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
[ -n "$iapp_interface" ] && {
local ifname