diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-25 22:11:21 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-25 22:11:21 +0000 |
| commit | b2077b03758d6b7a705faf0665fed03d5b093c48 (patch) | |
| tree | a7f1d81229deee0a9b85f7a146c727a61dffde4f /package | |
| parent | 6cf28f09556776782c99f6e1a1c7f9646db1b8a7 (diff) | |
mac80211: restrict the killing of wpa_supplicant processes to the right interface (#5991)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19334 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 1c12a154c..44082aa99 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 |