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

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index ec231457e..7c77c0b2a 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -34,6 +34,19 @@ 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"
@@ -42,12 +55,13 @@ wifi_fixup_hwmode() {
 	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
+			case "$hwmode_11n" in
 				a|g) ;;
 				default) hwmode_11n="$default"
 			esac