From dcd1178611135cc725a578bec65f92af8d3f3cb9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 24 Mar 2009 23:42:09 +0000 Subject: [package] sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15028 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/network/config.sh | 1 + package/base-files/files/sbin/wifi | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'package/base-files') diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 9b4320507d..29b7fe5c13 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -231,6 +231,7 @@ setup_interface() { # Interface settings config_get mtu "$config" mtu config_get macaddr "$config" macaddr + macaddr="${macaddr:-$3}" grep "$iface:" /proc/net/dev > /dev/null && \ $DEBUG ifconfig "$iface" down && \ $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index e9752c6039..30ecb1b77c 100755 --- a/package/base-files/files/sbin/wifi +++ b/package/base-files/files/sbin/wifi @@ -70,7 +70,7 @@ start_net() {( [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null include /lib/network scan_interfaces - setup_interface "$1" "$2" + setup_interface "$1" "$2" "$3" )} set_wifi_up() { -- cgit v1.2.3