aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorLeon M. George <leon@georgemail.eu>2021-01-12 10:30:08 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-15 18:17:45 +0100
commitd5bbd4975cbb6fbbfb57d183d1e03453d88f923d (patch)
tree89c47dbd72c514aaa38daf2691d119b194fe1434 /package
parent218eff5bdbffbb92e222ba0183ae25220d2defe3 (diff)
downloadupstream-d5bbd4975cbb6fbbfb57d183d1e03453d88f923d.tar.gz
upstream-d5bbd4975cbb6fbbfb57d183d1e03453d88f923d.tar.bz2
upstream-d5bbd4975cbb6fbbfb57d183d1e03453d88f923d.zip
hostapd: fix setting wps_state to "not configured"
With encryption disabled, it was intended to set wpa_state=1 (enabled, not configured) through the 'wps_not_configured' flag. The flag is set appropriately but the condition using it is broken. Instead, 'wps_configured' is checked and wpa_state is always 2 (enabled, configured). Fix it by using the correct variable name. Fixes: 498d84fc4e00 ("netifd: add wireless configuration support and port mac80211 to the new framework") Signed-off-by: Leon M. George <leon@georgemail.eu> [commit title/message improvements] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'package')
-rw-r--r--package/network/services/hostapd/Makefile2
-rw-r--r--package/network/services/hostapd/files/hostapd.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 4f740951c0..cbbe6c1009 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:=27
+PKG_RELEASE:=28
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 815f22db74..45a49b8faa 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -666,7 +666,7 @@ hostapd_set_bss_options() {
set_default wps_independent 1
wps_state=2
- [ -n "$wps_configured" ] && wps_state=1
+ [ -n "$wps_not_configured" ] && wps_state=1
[ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"