aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit7e6c947e4b2d3332846d3ae091c884d3abe654b6 (patch)
tree82ca1378641500e5f514976a1fe1afa049dc1414 /package
parent28b9fea4e759470fd3e1f285b228b7101b15b18b (diff)
downloadupstream-7e6c947e4b2d3332846d3ae091c884d3abe654b6.tar.gz
upstream-7e6c947e4b2d3332846d3ae091c884d3abe654b6.tar.bz2
upstream-7e6c947e4b2d3332846d3ae091c884d3abe654b6.zip
sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa
SVN-Revision: 15028
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh1
-rwxr-xr-xpackage/base-files/files/sbin/wifi2
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh2
3 files changed, 3 insertions, 2 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() {
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 12002121a6..998a2f58ff 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -251,8 +251,8 @@ enable_broadcom() {
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
bridge="$(bridge_interface "$net_cfg")"
- append if_up "start_net '$ifname' '$net_cfg'" ";$N"
append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
+ append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N"
}
[ -z "$nasopts" ] || {
eval "${vif}_ssid=\"\$ssid\""