On Tue, Dec 04, 2012 at 01:02:14PM +0100, Helmut Schaa wrote: > Previously only the first macfilter configuration would have been used > on all interfaces. However, the configuration was always done per vif > already. Hence, move the macfilter setup into hostapd.sh where and > create one mac list file per vif. > > Signed-off-by: Helmut Schaa <[email protected]> > --- > package/mac80211/files/lib/wifi/mac80211.sh | 20 -------------------- > package/network/services/hostapd/files/hostapd.sh | 21 > +++++++++++++++++++++ > 2 files changed, 21 insertions(+), 20 deletions(-) > > diff --git a/package/mac80211/files/lib/wifi/mac80211.sh > b/package/mac80211/files/lib/wifi/mac80211.sh > index eadaa3e..a89696d 100644 > --- a/package/mac80211/files/lib/wifi/mac80211.sh > +++ b/package/mac80211/files/lib/wifi/mac80211.sh > @@ -6,8 +6,6 @@ mac80211_hostapd_setup_base() { > local ifname="$2" > > cfgfile="/var/run/hostapd-$phy.conf" > - macfile="/var/run/hostapd-$phy.maclist" > - [ -e "$macfile" ] && rm -f "$macfile" > > config_get device "$vif" device > config_get country "$device" country > @@ -51,24 +49,6 @@ mac80211_hostapd_setup_base() { > config_get_bool country_ie "$device" country_ie "$country_ie" > [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N" > > - config_get macfilter "$vif" macfilter > - case "$macfilter" in > - allow) > - append base_cfg "macaddr_acl=1" "$N" > - append base_cfg "accept_mac_file=$macfile" "$N" > - ;; > - deny) > - append base_cfg "macaddr_acl=0" "$N" > - append base_cfg "deny_mac_file=$macfile" "$N" > - ;; > - esac > - config_get maclist "$vif" maclist > - [ -n "$maclist" ] && { > - for mac in $maclist; do > - echo "$mac" >> $macfile > - done > - } > -
This is in mac80211_hostapd_setup_base() which is invoked in mac80211_hostapd_setup_bss() that is already invoked per-vif. So I don't think this change was really needed. Cheers, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara
pgpaKDGBHtFI5.pgp
Description: PGP signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
