X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/61060584fe3f8cb8f1301fd09806d62170088a8f..aa196b361191e3498cd8b96f0669722a4742cca2:/package/base-files/files/sbin/wifi?ds=sidebyside

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 0d26468ba..90aeef725 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -34,15 +34,50 @@ bridge_interface() {(
 	[ "$iftype" = bridge ] && config_get "$cfg" ifname
 )}
 
+wifi_fixup_hwmode() {
+	local device="$1"
+	local default="$2"
+	local hwmode hwmode_11n
+
+	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+	case "$hwmode" in
+		11bg) hwmode=bg;;
+		11a) hwmode=a;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
+		11n*)
+			hwmode_11n="${hwmode##11n}"
+			case "$hwmode" in
+				a|g) ;;
+				default) hwmode_11n="$default"
+			esac
+			config_set "$device" hwmode_11n "$hwmode_11n"
+		;;
+		*)
+			hwmode=
+			if [ "${channel:-0}" -gt 0 ]; then 
+				if [ "${channel:-0}" -gt 14 ]; then
+					hwmode=a
+				else
+					hwmode=g
+				fi
+			else
+				hwmode="$default"
+			fi
+		;;
+	esac
+	config_set "$device" hwmode "$hwmode"
+}
 
 wifi_updown() {
 	[ enable = "$1" ] && wifi_updown disable "$2"
 	for device in ${2:-$DEVICES}; do (
-	        config_get disabled "$device" disabled
-	        [ 1 == "$disabled" ] && {
-	        	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,29 +101,32 @@ 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"
 )}
 
 set_wifi_up() {
 	local cfg="$1"
 	local ifname="$2"
-	uci set "/var/state/wireless.${cfg}.up=1"
-	uci set "/var/state/wireless.${cfg}.ifname=$ifname"
+	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
-		append vifstr "$vif" "|"
+		uci_revert_state wireless "$vif"
 	done
-	FILE="/var/state/wireless.$$"
-	grep -vE "^config_set '($vifstr)' " /var/state/wireless > "$FILE"
-	mv "$FILE" /var/state/wireless
 }
 
 scan_wifi() {