aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-02-02 02:19:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-02-02 02:19:10 +0000
commit19555b702efd6bb5b76d8ded7ddb10da4d7cd3aa (patch)
treef6835a5bd7d65cc556f7faf0f89019ef1f9bcc6a
parent52c2e565dd53474cc8256e314a7357ef7b61292d (diff)
downloadupstream-19555b702efd6bb5b76d8ded7ddb10da4d7cd3aa.tar.gz
upstream-19555b702efd6bb5b76d8ded7ddb10da4d7cd3aa.tar.bz2
upstream-19555b702efd6bb5b76d8ded7ddb10da4d7cd3aa.zip
/sbin/wifi: improve reliability of restarts by resetting the state properly
SVN-Revision: 19495
-rwxr-xr-xpackage/base-files/files/sbin/wifi9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 7c77c0b2a2..e21ea6ba9e 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -84,7 +84,10 @@ wifi_fixup_hwmode() {
}
wifi_updown() {
- [ enable = "$1" ] && wifi_updown disable "$2"
+ [ enable = "$1" ] && {
+ wifi_updown disable "$2"
+ scan_wifi
+ }
for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled
[ 1 == "$disabled" ] && {
@@ -134,7 +137,7 @@ set_wifi_down() {
local vifs vif vifstr
[ -f "/var/run/wifi-${cfg}.pid" ] &&
- kill "$(cat "/var/run/wifi-${cfg}.pid")"
+ kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null
uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs
for vif in $vifs; do
@@ -144,11 +147,13 @@ set_wifi_down() {
scan_wifi() {
local cfgfile="$1"
+ DEVICES=
config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE
case "$TYPE" in
wifi-device)
append DEVICES "$CONFIG_SECTION"
+ config_set "$CONFIG_SECTION" vifs ""
;;
wifi-iface)
config_get device "$CONFIG_SECTION" device