X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/05adaa9794e41d02870a74a1ed7ba58cc59b9286..aa196b361191e3498cd8b96f0669722a4742cca2:/package/base-files/files/sbin/wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index d877c7398..90aeef725 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -14,7 +14,7 @@ find_net_config() {(
 		include /lib/network
 		scan_interfaces
 
-		config_get ifname "$vif" ifnamea
+		config_get ifname "$vif" ifname
 
 		cfg="$(find_config "$ifname")"
 	}
@@ -34,25 +34,54 @@ bridge_interface() {(
 	[ "$iftype" = bridge ] && config_get "$cfg" ifname
 )}
 
-
-wifi_up() {
-	for device in ${2:-$DEVICES}; do (
-		config_get iftype "$device" type
-		if eval "type enable_$iftype" 2>/dev/null >/dev/null; then
-			eval "scan_$iftype '$device'"
-			eval "enable_$iftype '$device'" || echo "$device($iftype): Setup failed"
-		else
-			echo "$device($iftype): Interface type not supported"
-		fi
-	); done
+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_down() {
+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 iftype "$device" type
-		if eval "type disable_$iftype" 2>/dev/null >/dev/null; then
+		if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
 			eval "scan_$iftype '$device'"
-			eval "disable_$iftype '$device'" || echo "$device($iftype): Disable failed"
+			eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
 		else
 			echo "$device($iftype): Interface type not supported"
 		fi
@@ -72,45 +101,60 @@ 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_get_bool() {
-	local _tmp
-	config_get "$1" "$2" "$3"
-	eval "_tmp=\$$1"
-	case "$_tmp" in
-		1|on|enabled) eval "$1=1";;
-		0|off|disabled) eval "$1=0";;
-		*) eval "$1=${4:-0}";;
-	esac
+set_wifi_up() {
+	local cfg="$1"
+	local ifname="$2"
+	uci_set_state wireless "$cfg" up 1
+	uci_set_state wireless "$cfg" ifname "$ifname"
 }
 
-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_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_down "$2";;
+	down) wifi_updown "disable" "$2";;
 	detect) wifi_detect "$2";;
-	*) wifi_up "$2";;
+	*) wifi_updown "enable" "$2";;
 esac