aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/broadcom-wl
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-11-11 21:59:58 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-11-11 21:59:58 +0000
commite0aeebea8ecb0076e65597eef9f4581a04c015d1 (patch)
treeff9c739323f0938316c8c51dda41cc1449964481 /package/kernel/broadcom-wl
parent70ac1dbe515ae091022688f8c5725fc2df2e5366 (diff)
downloadupstream-e0aeebea8ecb0076e65597eef9f4581a04c015d1.tar.gz
upstream-e0aeebea8ecb0076e65597eef9f4581a04c015d1.tar.bz2
upstream-e0aeebea8ecb0076e65597eef9f4581a04c015d1.zip
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 <nlhintz@hotmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38753 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/broadcom-wl')
-rw-r--r--package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
index 80cd9d5f3d..191092af38 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 <<EOF
$ifdown