From 7f1760652d125ff3867abe3c62dcb0f22a0013f1 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 23 Jan 2010 08:28:20 +0000
Subject: mac80211: improve wifi interface cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19285 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/mac80211/files/lib/wifi/mac80211.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'package/mac80211')
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index cd03b3082..1c12a154c 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -174,12 +174,13 @@ disable_mac80211() (
# kill all running hostapd and wpa_supplicant processes that
# are running on atheros/mac80211 vifs
for pid in `pidof hostapd wpa_supplicant`; do
- grep "$phy" /proc/$pid/cmdline >/dev/null && \
+ grep -E "($phy|wlan)" /proc/$pid/cmdline >/dev/null && \
kill $pid
done
include /lib/network
for wdev in $(ls /sys/class/ieee80211/${phy}/device/net 2>/dev/null); do
+ [ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1
ifconfig "$wdev" down 2>/dev/null
unbridge "$dev"
iw dev "$wdev" del
--
cgit v1.2.3