From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 25 Jan 2010 22:11:21 +0000 (+0000)
Subject: mac80211: restrict the killing of wpa_supplicant processes to the right interface... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d689fedac0ac19a9a73d4b62e8dda2045076a30;hp=6f0883ae22c7b4f207f08c98dd984432eb1fffef;p=lede.git

mac80211: restrict the killing of wpa_supplicant processes to the right interface (#5991)

SVN-Revision: 19334
---

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 1c12a154c5..44082aa990 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -173,14 +173,18 @@ disable_mac80211() (
 	set_wifi_down "$device"
 	# kill all running hostapd and wpa_supplicant processes that
 	# are running on atheros/mac80211 vifs
-	for pid in `pidof hostapd wpa_supplicant`; do
-		grep -E "($phy|wlan)" /proc/$pid/cmdline >/dev/null && \
+	for pid in `pidof hostapd`; do
+		grep -E "$phy" /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
+		for pid in `pidof wpa_supplicant`; do
+			grep "$wdev" /proc/$pid/cmdline >/dev/null && \
+				kill $pid
+		done
 		ifconfig "$wdev" down 2>/dev/null
 		unbridge "$dev"
 		iw dev "$wdev" del