aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-03-24 23:42:09 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-03-24 23:42:09 +0000
commitdcd1178611135cc725a578bec65f92af8d3f3cb9 (patch)
tree0724b13e14c2f7f26a1a7883ee01569f0e438446 /package/base-files
parent35cc26545e2deb0e5a3b9adb6b473d013852df81 (diff)
downloadupstream-dcd1178611135cc725a578bec65f92af8d3f3cb9.tar.gz
upstream-dcd1178611135cc725a578bec65f92af8d3f3cb9.tar.bz2
upstream-dcd1178611135cc725a578bec65f92af8d3f3cb9.zip
[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
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh1
-rwxr-xr-xpackage/base-files/files/sbin/wifi2
2 files changed, 2 insertions, 1 deletions
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() {