X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/af5a1e3a29c9a33f3d1083e8d1421785569cc763..bc175c58b05a52549cf259c9a8cc455d63f5fa63:/package/base-files/files/sbin/wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 151036e9c..e0aca6315 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -36,12 +36,13 @@ bridge_interface() {(
 
 
 wifi_updown() {
+	[ enable = "$1" ] && wifi_updown disable "$2"
 	for device in ${2:-$DEVICES}; do (
-	        config_get disabled "$device" disabled
-	        [ "$disabled" == "1" ] && {
-	        	echo "'$device' is disabled"
-	        	set disable
-	        }
+		config_get disabled "$device" disabled
+		[ 1 == "$disabled" ] && {
+			echo "'$device' is disabled"
+			set disable
+		}
 		config_get iftype "$device" type
 		if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
 			eval "scan_$iftype '$device'"
@@ -65,31 +66,57 @@ wifi_detect() {
 start_net() {(
 	local iface="$1"
 	local config="$2"
+	local vifmac="$3"
 
+	[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
 	include /lib/network
 	scan_interfaces
-	setup_interface "$1" "$2"
+	setup_interface "$iface" "$config" "" "$vifmac"
 )}
 
-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
+set_wifi_up() {
+	local cfg="$1"
+	local ifname="$2"
+	uci_set_state wireless "$cfg" up 1
+	uci_set_state wireless "$cfg" ifname "$ifname"
+}
+
+set_wifi_down() {
+	local cfg="$1"
+	local vifs vif vifstr
+
+	[ -f "/var/run/wifi-${cfg}.pid" ] &&
+		kill "$(cat "/var/run/wifi-${cfg}.pid")"
+	uci_revert_state wireless "$cfg"
+	config_get vifs "$cfg" vifs
+	for vif in $vifs; do
+		uci_revert_state wireless "$vif"
+	done
+}
+
+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";;