X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fwifi;h=30ecb1b77c748d141b79105662a776a2fb916cc7;hb=6d85891fde78e80a55b5c708ae958a7cc6ba48ab;hp=6e8e41845874e4fa42bb18a62886eb00156e929c;hpb=1addd4cc9c4dd7605c9d3e6ed550b229dc6ebe05;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 6e8e41845..30ecb1b77 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'"
@@ -66,11 +67,32 @@ start_net() {(
 	local iface="$1"
 	local config="$2"
 
+	[ -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 "$1" "$2" "$3"
 )}
 
+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() {