/sbin/wifi: improve reliability of restarts by resetting the state properly

SVN-Revision: 19495
This commit is contained in:
Felix Fietkau 2010-02-02 02:19:10 +00:00
parent 52c2e565dd
commit 19555b702e
1 changed files with 7 additions and 2 deletions

View File

@ -84,7 +84,10 @@ wifi_fixup_hwmode() {
} }
wifi_updown() { wifi_updown() {
[ enable = "$1" ] && wifi_updown disable "$2" [ enable = "$1" ] && {
wifi_updown disable "$2"
scan_wifi
}
for device in ${2:-$DEVICES}; do ( for device in ${2:-$DEVICES}; do (
config_get disabled "$device" disabled config_get disabled "$device" disabled
[ 1 == "$disabled" ] && { [ 1 == "$disabled" ] && {
@ -134,7 +137,7 @@ set_wifi_down() {
local vifs vif vifstr local vifs vif vifstr
[ -f "/var/run/wifi-${cfg}.pid" ] && [ -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" uci_revert_state wireless "$cfg"
config_get vifs "$cfg" vifs config_get vifs "$cfg" vifs
for vif in $vifs; do for vif in $vifs; do
@ -144,11 +147,13 @@ set_wifi_down() {
scan_wifi() { scan_wifi() {
local cfgfile="$1" local cfgfile="$1"
DEVICES=
config_cb() { config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE config_get TYPE "$CONFIG_SECTION" TYPE
case "$TYPE" in case "$TYPE" in
wifi-device) wifi-device)
append DEVICES "$CONFIG_SECTION" append DEVICES "$CONFIG_SECTION"
config_set "$CONFIG_SECTION" vifs ""
;; ;;
wifi-iface) wifi-iface)
config_get device "$CONFIG_SECTION" device config_get device "$CONFIG_SECTION" device