hostapd: fix short_preamble option

[openwrt.git] / package / network / services / hostapd / files / netifd.sh

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 020c41f..8380357 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -83,7 +83,7 @@ EOF
 
 hostapd_common_add_bss_config() {
        config_add_string bssid ssid
-       config_add_boolean wds
+       config_add_boolean wds wmm hidden
 
        config_add_int maxassoc max_inactivity
        config_add_boolean disassoc_low_ack ap_isolate short_preamble
@@ -140,7 +140,7 @@ hostapd_set_bss_options() {
                maxassoc max_inactivity disassoc_low_ack ap_isolate auth_cache \
                wps_pushbutton wps_label ext_registrar \
                wps_device_type wps_device_name wps_manufacturer wps_pin \
-               macfilter ssid wmm hidden
+               macfilter ssid wmm hidden short_preamble
 
        set_default ap_isolate 0
        set_default maxassoc 0
@@ -308,7 +308,7 @@ hostapd_set_bss_options() {
                esac
        fi
 
-       _macfile="/var/run/hostapd-$phy-$ifname.maclist"
+       _macfile="/var/run/hostapd-$ifname.maclist"
        case "$macfilter" in
                allow)
                        append bss_conf "macaddr_acl=1" "$N"
@@ -324,7 +324,8 @@ hostapd_set_bss_options() {
        esac
 
        [ -n "$_macfile" ] && {
-               json_get_vars macfile maclist
+               json_get_vars macfile
+               json_get_values maclist maclist
 
                rm -f "$_macfile"
                (