hostapd: fix maclist processing with netifd
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 3 Dec 2013 09:02:58 +0000 (09:02 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 3 Dec 2013 09:02:58 +0000 (09:02 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38991 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

index 020c41f..4879c04 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"
                (