X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6d85891fde78e80a55b5c708ae958a7cc6ba48ab..653a848d6dbd7d56c924ede88d76004c7ddcf0eb:/package/base-files/files/sbin/wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 30ecb1b77..7c77c0b2a 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -34,6 +34,54 @@ bridge_interface() {(
 	[ "$iftype" = bridge ] && config_get "$cfg" ifname
 )}
 
+prepare_key_wep() {
+	local key="$1"
+	local hex=1
+
+	echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0
+	[ "${#key}" -eq 10 -a $hex -eq 1 ] || \
+	[ "${#key}" -eq 26 -a $hex -eq 1 ] || {
+		[ "${key:0:2}" = "s:" ] && key="${key#s:}"
+        	key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
+	}
+	echo "$key"
+}
+
+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_11n" 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"
@@ -66,11 +114,12 @@ 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" "$3"
+	setup_interface "$iface" "$config" "" "$vifmac"
 )}
 
 set_wifi_up() {