From d1c55bb33e14b3ee351035f542977bf26232cba9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 11 Nov 2013 21:59:58 +0000 Subject: broadcom-wl: shutdown 'nas' when 'wl' device is disabled 'nas' must be shutdown independently for each 'wl' device to properly support devices with multiple radios. Do the shutdown when the device is disabled instead of when it is brought up. Signed-off-by: Nathan Hintz SVN-Revision: 38753 --- package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package/kernel/broadcom-wl') diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh index 80cd9d5..191092a 100644 --- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh @@ -101,6 +101,9 @@ disable_broadcom() { ( include /lib/network + local pid_file=/var/run/nas.$device.pid + [ -e $pid_file ] && start-stop-daemon -K -q -s SIGKILL -p $pid_file && rm $pid_file + # make sure the interfaces are down and removed from all bridges for dev in $device ${device}-1 ${device}-2 ${device}-3; do ifconfig "$dev" down 2>/dev/null >/dev/null && { @@ -346,7 +349,6 @@ enable_broadcom() { } _c=$(($_c + 1)) done - killall -KILL nas >&- 2>&- wlc ifname "$device" stdin <