From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 24 Mar 2007 13:42:53 +0000 (+0000)
Subject: small cleanup
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2954f04b410cfb5e72ac6807717c58c06dfd07d4;p=openwrt%2Fstaging%2Frobimarko.git

small cleanup

SVN-Revision: 6663
---

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 151036e9cb..6e8e418458 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -71,25 +71,29 @@ start_net() {(
 	setup_interface "$1" "$2"
 )}
 
-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_updown "disable" "$2";;