diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-02 02:19:10 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-02 02:19:10 +0000 |
| commit | f65f68dbdfbb6e94aea504691b8dd4d5b1a9ef96 (patch) | |
| tree | aae806513a16e3d8c15e8e01bdb3f75ddf2ecee6 | |
| parent | 1fc373c5d3e13bc9076efc144d47f6b28969ab99 (diff) | |
/sbin/wifi: improve reliability of restarts by resetting the state properly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19495 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/sbin/wifi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index 7c77c0b2a..e21ea6ba9 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 |