projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9161a70
)
use pidfiles for hostapd/wpa_supplicant instead of killing all processes when bringin...
author
Felix Fietkau
<nbd@openwrt.org>
Wed, 29 Oct 2008 17:26:49 +0000
(17:26 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Wed, 29 Oct 2008 17:26:49 +0000
(17:26 +0000)
SVN-Revision: 13078
package/base-files/files/sbin/wifi
patch
|
blob
|
history
package/hostapd/files/hostapd.sh
patch
|
blob
|
history
package/madwifi/files/lib/wifi/madwifi.sh
patch
|
blob
|
history
package/wpa_supplicant/files/wpa_supplicant.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/sbin/wifi
b/package/base-files/files/sbin/wifi
index 63e132d4f1c1e9291ecf21b9b4f455dda3e1a47f..e9752c60393709f18f9246a8f4fadc7fde589b28 100755
(executable)
--- a/
package/base-files/files/sbin/wifi
+++ b/
package/base-files/files/sbin/wifi
@@
-84,6
+84,8
@@
set_wifi_down() {
local cfg="$1"
local vifs vif vifstr
local cfg="$1"
local vifs vif vifstr
+ [ -f "/var/run/wifi-${cfg}.pid" ] &&
+ kill "$(cat "/var/run/wifi-${cfg}.pid")"
uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
diff --git
a/package/hostapd/files/hostapd.sh
b/package/hostapd/files/hostapd.sh
index 1159c3b15646d8fadb354d473f13c1487ad9e51b..707fd8c4b8a04fd9dacc263e52787c5ab0c6c87c 100644
(file)
--- a/
package/hostapd/files/hostapd.sh
+++ b/
package/hostapd/files/hostapd.sh
@@
-96,6
+96,6
@@
wpa=$wpa
wpa_pairwise=$crypto
$hostapd_cfg
EOF
wpa_pairwise=$crypto
$hostapd_cfg
EOF
- hostapd -B /var/run/hostapd-$ifname.conf
+ hostapd -
P /var/run/wifi-$ifname.conf -
B /var/run/hostapd-$ifname.conf
}
}
diff --git
a/package/madwifi/files/lib/wifi/madwifi.sh
b/package/madwifi/files/lib/wifi/madwifi.sh
index 6ee6435658a6446816a3052197da42934d1a2d8c..5ce288f6e634021d9106c98e30719251099db688 100755
(executable)
--- a/
package/madwifi/files/lib/wifi/madwifi.sh
+++ b/
package/madwifi/files/lib/wifi/madwifi.sh
@@
-50,18
+50,14
@@
disable_atheros() (
local device="$1"
set_wifi_down "$device"
local device="$1"
set_wifi_down "$device"
- # kill all running hostapd and wpa_supplicant processes that
- # are running on atheros vifs
- for pid in `pidof hostapd wpa_supplicant`; do
- grep ath /proc/$pid/cmdline >/dev/null && \
- kill $pid
- done
include /lib/network
cd /proc/sys/net
for dev in *; do
grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
include /lib/network
cd /proc/sys/net
for dev in *; do
grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
- ifconfig "$dev" down
+ [ -f "/var/run/wifi-${dev}.pid" ] &&
+ kill "$(cat "/var/run/wifi-${dev}.pid")"
+ ifconfig "$dev" down
unbridge "$dev"
wlanconfig "$dev" destroy
}
unbridge "$dev"
wlanconfig "$dev" destroy
}
diff --git
a/package/wpa_supplicant/files/wpa_supplicant.sh
b/package/wpa_supplicant/files/wpa_supplicant.sh
index 37ebef7a4b4a44f53f817f25cf1f9d37899a6875..debdf811a5d1117b9c57832bd9135eb7d14e4c35 100644
(file)
--- a/
package/wpa_supplicant/files/wpa_supplicant.sh
+++ b/
package/wpa_supplicant/files/wpa_supplicant.sh
@@
-75,5
+75,5
@@
network={
$password
}
EOF
$password
}
EOF
- [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+ [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -
P "/var/run/wifi-${ifname}.pid" -
D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
}
}