hostapd: fix maclist processing with netifd
authorFelix Fietkau <nbd@openwrt.org>
Tue, 3 Dec 2013 09:02:58 +0000 (09:02 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 3 Dec 2013 09:02:58 +0000 (09:02 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38991

package/network/services/hostapd/files/netifd.sh

index 020c41fd03a8f08903684013a74f1170113438d1..4879c044b2d4a4130372d0104257891016d1c927 100644 (file)
@@ -308,7 +308,7 @@ hostapd_set_bss_options() {
                esac
        fi
 
                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"
        case "$macfilter" in
                allow)
                        append bss_conf "macaddr_acl=1" "$N"
@@ -324,7 +324,8 @@ hostapd_set_bss_options() {
        esac
 
        [ -n "$_macfile" ] && {
        esac
 
        [ -n "$_macfile" ] && {
-               json_get_vars macfile maclist
+               json_get_vars macfile
+               json_get_values maclist maclist
 
                rm -f "$_macfile"
                (
 
                rm -f "$_macfile"
                (