X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fwifi;h=e2dd0a32d560fddc552eee6be66786aa9ed099ac;hb=3751e75fb0166a9955e839d3a1d760a6816690d0;hp=5b6007f0a92151ff87216a680355aa788cea9258;hpb=505a102cb37f0a44c56cf6079a629debd08a8bad;p=openwrt.git

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 5b6007f0a9..e2dd0a32d5 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -3,6 +3,14 @@
 
 . /etc/functions.sh
 
+usage() {
+	cat <<EOF
+Usage: $0 [down|detect]
+enables (default), disables or detects a wifi configuration.
+EOF
+	exit 1
+}
+
 find_net_config() {(
 	local vif="$1"
 	local cfg
@@ -61,7 +69,7 @@ wifi_fixup_hwmode() {
 		11g) hwmode=g;;
 		11n*)
 			hwmode_11n="${hwmode##11n}"
-			case "$hwmode" in
+			case "$hwmode_11n" in
 				a|g) ;;
 				default) hwmode_11n="$default"
 			esac
@@ -84,7 +92,10 @@ wifi_fixup_hwmode() {
 }
 
 wifi_updown() {
-	[ enable = "$1" ] && wifi_updown disable "$2"
+	[ enable = "$1" ] && {
+		wifi_updown disable "$2"
+		scan_wifi
+	}
 	for device in ${2:-$DEVICES}; do (
 		config_get disabled "$device" disabled
 		[ 1 == "$disabled" ] && {
@@ -134,7 +145,7 @@ set_wifi_down() {
 	local vifs vif vifstr
 
 	[ -f "/var/run/wifi-${cfg}.pid" ] &&
-		kill "$(cat "/var/run/wifi-${cfg}.pid")"
+		kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null
 	uci_revert_state wireless "$cfg"
 	config_get vifs "$cfg" vifs
 	for vif in $vifs; do
@@ -144,12 +155,23 @@ set_wifi_down() {
 
 scan_wifi() {
 	local cfgfile="$1"
+	DEVICES=
 	config_cb() {
-		config_get TYPE "$CONFIG_SECTION" TYPE
-		case "$TYPE" in
+		local type="$1"
+		local section="$2"
+
+		# section start
+		case "$type" in
 			wifi-device)
-				append DEVICES "$CONFIG_SECTION"
+				append DEVICES "$section"
+				config_set "$section" vifs ""
+				config_set "$section" ht_capab ""
 			;;
+		esac
+
+		# section end
+		config_get TYPE "$CONFIG_SECTION" TYPE
+		case "$TYPE" in
 			wifi-iface)
 				config_get device "$CONFIG_SECTION" device
 				config_get vifs "$device" vifs 
@@ -169,5 +191,6 @@ scan_wifi
 case "$1" in
 	down) wifi_updown "disable" "$2";;
 	detect) wifi_detect "$2";;
+	--help|help) usage;;
 	*) wifi_updown "enable" "$2";;
 esac