From 1addd4cc9c4dd7605c9d3e6ed550b229dc6ebe05 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 24 Mar 2007 13:42:53 +0000
Subject: small cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6663 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/sbin/wifi | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'package/base-files/files/sbin/wifi')

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 151036e9c..6e8e41845 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";;
-- 
cgit v1.2.3