port last commit to -ng

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

diff --git a/package/base-files/default/sbin/wifi b/package/base-files/default/sbin/wifi
index f1ac94f..4a3ec8c 100755 (executable)
--- a/package/base-files/default/sbin/wifi
+++ b/package/base-files/default/sbin/wifi
@@ -30,15 +30,15 @@ config_cb() {
 }
 
 config_load wireless
 }
 
 config_load wireless

-include wifi
+include /lib/wifi

 
 for device in $DEVICES; do (
 
 for device in $DEVICES; do (

-       config_get type "$device" type
-       eval "type setup_$type" 2>/dev/null >/dev/null && {
-               eval "scan_$type '$device'"
-               eval "setup_$type '$device'" && {
+       config_get iftype "$device" type
+       eval "type setup_$iftype" 2>/dev/null >/dev/null && {
+               eval "scan_$iftype '$device'"
+               eval "setup_$iftype '$device'" && {

                        # TODO: set up network settings
                        /bin/true
                        # TODO: set up network settings
                        /bin/true

-               } || echo "$device($type): Setup failed" || true
-       } || echo "$device($type): Interface type not supported"
+               } || echo "$device($iftype): Setup failed" || true
+       } || echo "$device($iftype): Interface type not supported"

 ); done
 ); done