From 5682b73fd743e2db18b90e92c5d4ad294a153528 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 22 Jan 2010 16:16:06 +0000 Subject: [package] broadcom-wl: detect all radios when generating config, do wireless setup per-interface (#5308) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19273 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/broadcom-wl/files/lib/wifi/broadcom.sh | 32 +++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'package/broadcom-wl') diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh index 3356e08db4..75f8b085bb 100644 --- a/package/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh @@ -42,7 +42,7 @@ scan_broadcom() { local _c= for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do - config_set "$vif" ifname "wl0${_c:+.$_c}" + config_set "$vif" ifname "${device}${_c:+.$_c}" _c=$((${_c:-0} + 1)) done config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}" @@ -93,13 +93,14 @@ scan_broadcom() { } disable_broadcom() { - set_wifi_down "$1" - wlc down + local device="$1" + set_wifi_down "$device" + wlc ifname "$device" down ( include /lib/network # make sure the interfaces are down and removed from all bridges - for dev in wl0 wl0.1 wl0.2 wl0.3; do + for dev in $device ${device}.1 ${device}.2 ${device}.3; do ifconfig "$dev" down 2>/dev/null >/dev/null && { unbridge "$dev" } @@ -109,6 +110,7 @@ disable_broadcom() { } enable_broadcom() { + local device="$1" local _c config_get channel "$device" channel config_get country "$device" country @@ -285,7 +287,7 @@ enable_broadcom() { _c=$(($_c + 1)) done killall -KILL nas >&- 2>&- - wlc stdin <