add a check for brctl in the unbridge() function (fixes #1417)

[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..2b4f1ce 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
 
                include /lib/network
                scan_interfaces
 

-               config_get ifname "$vif" ifnamea
+               config_get ifname "$vif" ifname

 
                cfg="$(find_config "$ifname")"
        }
 
                cfg="$(find_config "$ifname")"
        }


@@ -78,17 +78,6 @@ start_net() {(
        setup_interface "$1" "$2"
 )}
 
        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
 config_cb() {
        config_get TYPE "$CONFIG_SECTION" TYPE
        case "$TYPE" in