more fixes

[openwrt.git] / package / base-files / files / sbin / wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index d877c73..2ca5d22 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -14,7 +14,7 @@ find_net_config() {(
                include /lib/network
                scan_interfaces
 
-               config_get ifname "$vif" ifnamea
+               config_get ifname "$vif" ifname
 
                cfg="$(find_config "$ifname")"
        }
@@ -35,24 +35,17 @@ bridge_interface() {(
 )}
 
 
-wifi_up() {
+wifi_updown() {
        for device in ${2:-$DEVICES}; do (
+               config_get disabled "$device" disabled
+               [ 1 == "$disabled" ] && {
+                       echo "'$device' is disabled"
+                       set disable
+               }
                config_get iftype "$device" type
-               if eval "type enable_$iftype" 2>/dev/null >/dev/null; then
+               if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
                        eval "scan_$iftype '$device'"
-                       eval "enable_$iftype '$device'" || echo "$device($iftype): Setup failed"
-               else
-                       echo "$device($iftype): Interface type not supported"
-               fi
-       ); done
-}
-
-wifi_down() {
-       for device in ${2:-$DEVICES}; do (
-               config_get iftype "$device" type
-               if eval "type disable_$iftype" 2>/dev/null >/dev/null; then
-                       eval "scan_$iftype '$device'"
-                       eval "disable_$iftype '$device'" || echo "$device($iftype): Disable failed"
+                       eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
                else
                        echo "$device($iftype): Interface type not supported"
                fi
@@ -78,39 +71,32 @@ start_net() {(
        setup_interface "$1" "$2"
 )}
 
-config_get_bool() {
-       local _tmp
-       config_get "$1" "$2" "$3"
-       eval "_tmp=\$$1"
-       case "$_tmp" in
-               1|on|enabled) eval "$1=1";;
-               0|off|disabled) eval "$1=0";;
-               *) eval "$1=${4:-0}";;
-       esac
-}
-
-config_cb() {
-       config_get TYPE "$CONFIG_SECTION" TYPE
-       case "$TYPE" in
-               wifi-device)
-                       append DEVICES "$CONFIG_SECTION"
-               ;;
-               wifi-iface)
-                       config_get device "$CONFIG_SECTION" device
-                       config_get vifs "$device" vifs 
-                       append vifs "$CONFIG_SECTION"
-                       config_set "$device" vifs "$vifs"
-               ;;
-       esac
+scan_wifi() {
+       local cfgfile="$1"
+       config_cb() {
+               config_get TYPE "$CONFIG_SECTION" TYPE
+               case "$TYPE" in
+                       wifi-device)
+                               append DEVICES "$CONFIG_SECTION"
+                       ;;
+                       wifi-iface)
+                               config_get device "$CONFIG_SECTION" device
+                               config_get vifs "$device" vifs 
+                               append vifs "$CONFIG_SECTION"
+                               config_set "$device" vifs "$vifs"
+                       ;;
+               esac
+       }
+       config_load "${cfgfile:-wireless}"
 }
 
 DEVICES=
 DRIVERS=
-config_load wireless
 include /lib/wifi
+scan_wifi
 
 case "$1" in
-       down) wifi_down "$2";;
+       down) wifi_updown "disable" "$2";;
        detect) wifi_detect "$2";;
-       *) wifi_up "$2";;
+       *) wifi_updown "enable" "$2";;
 esac