mac80211: improve wifi interface cleanup

[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index cd03b30..1c12a15 100644 (file)
--- 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
        # 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
                        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
                ifconfig "$wdev" down 2>/dev/null
                unbridge "$dev"
                iw dev "$wdev" del