X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=942a635f78d5904b9f6d9819dcea9f307f7544b4;hb=461c02892a66114b759f4b0483ff93b643e835a5;hp=534a737a4d02e7e7034b010a4cc3d2dbd10e0788;hpb=0da4b7c2080993059906e671fe33471142efbc73;p=openwrt.git

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 534a737a4d..942a635f78 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -76,15 +76,20 @@ enable_mac80211() {
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
 	config_get txpower "$device" txpower
+	config_get country "$device" country
+	config_get distance "$device" distance
 	find_mac80211_phy "$device" || return 0
 	config_get phy "$device" phy
 	local i=0
 	fixed=""
 
+	[ -n "$country" ] && iw reg set "$country"
 	[ "$channel" = "auto" -o "$channel" = "0" ] || {
 		fixed=1
 	}
 
+	[ -n "$distance" ] && iw phy "$phy" set distance "$distance"
+
 	export channel fixed
 	# convert channel to frequency
 	local freq="$(get_freq "$phy" "${fixed:+$channel}")"
@@ -125,7 +130,7 @@ enable_mac80211() {
 			;;
 			sta)
 				local wdsflag
-				[ "$wds" -gt 0 ] && wdsflag="wds on"
+				[ "$wds" -gt 0 ] && wdsflag="4addr on"
 				iw phy "$phy" interface add "$ifname" type managed $wdsflag
 				config_get_bool powersave "$vif" powersave 0
 				[ "$powersave" -gt 0 ] && powersave="on" || powersave="off"
@@ -147,7 +152,7 @@ enable_mac80211() {
 			else
 				offset="0"
 			fi
-			vif_mac="$( printf %02x $(($mac_1 + $offset)) ):$mac_2"
+			vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2"
 		}
 		ifconfig "$ifname" hw ether "$vif_mac"
 
@@ -174,20 +179,30 @@ enable_mac80211() {
 		# configured to handle the wep connection
 		if [ ! "$mode" = "ap" ]; then
 			case "$enc" in
-				wep)
+				*wep*)
 					config_get keymgmt "$vif" keymgmt
-					if [ -e "$keymgmt" ]; then
-						for idx in 1 2 3 4; do
-							local zidx
-							zidx = idx - 1
-							config_get key "$vif" "key${idx}"
-							if [ -n "$key" ]; then
-								append keystring "${zidx}:${key} "
-							fi
-						done
+					if [ -z "$keymgmt" ]; then
+						config_get key "$vif" key
+						key="${key:-1}"
+						case "$key" in
+							[1234])
+								for idx in 1 2 3 4; do
+									local zidx
+									zidx=$(($idx - 1))
+									config_get ckey "$vif" "key${idx}"
+									if [ -n "$ckey" ]; then
+										[ $idx -eq $key ] && zidx="d:${zidx}"
+										append keystring "${zidx}:$(prepare_key_wep "$ckey")"
+									fi
+								done
+								;;
+							*)
+								keystring="d:0:$(prepare_key_wep "$key")"
+								;;
+						esac
 					fi
 				;;
-				wpa)
+				*psk*|*wpa*)
 					config_get key "$vif" key
 				;;
 			esac
@@ -207,7 +222,7 @@ enable_mac80211() {
 
 		config_get rts "$vif" rts
 		if [ -n "$rts" ]; then
-			iw phy "$phy" set rts "${frag%%.*}"
+			iw phy "$phy" set rts "${rts%%.*}"
 		fi
 
 		ifconfig "$ifname" up
@@ -239,10 +254,10 @@ enable_mac80211() {
 			sta|mesh)
 				config_get bssid "$vif" bssid
 				case "$enc" in
-					wep)
-						if [ -e "$keymgmt" ]; then
+					*wep*)
+						if [ -z "$keymgmt" ]; then
 							[ -n "$keystring" ] &&
-								iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key "$keystring"
+								iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key $keystring
 						else
 							if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
 								wpa_supplicant_setup_vif "$vif" wext || {
@@ -254,7 +269,7 @@ enable_mac80211() {
 							fi
 						fi
 					;;
-					wpa*|psk*)
+					*wpa*|*psk*)
 						config_get key "$vif" key
 						if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
 							wpa_supplicant_setup_vif "$vif" wext || {
@@ -279,7 +294,7 @@ enable_mac80211() {
 check_device() {
 	config_get phy "$1" phy
 	[ -z "$phy" ] && {
-		find_mac80211_phy "$1" || return 0
+		find_mac80211_phy "$1" >/dev/null || return 0
 		config_get phy "$1" phy
 	}
 	[ "$phy" = "$dev" ] && found=1
@@ -288,16 +303,16 @@ check_device() {
 detect_mac80211() {
 	devidx=0
 	config_load wireless
+	while :; do
+		config_get type "radio$devidx" type
+		[ -n "$type" ] || break
+		devidx=$(($devidx + 1))
+	done
 	for dev in $(ls /sys/class/ieee80211); do
 		found=0
 		config_foreach check_device wifi-device
 		[ "$found" -gt 0 ] && continue
 
-		while :; do
-			config_get type "wifi$devidx" type
-			[ -n "$type" ] || break
-			devidx=$(($devidx + 1))
-		done
 		mode_11n=""
 		mode_band="g"
 		channel="5"
@@ -318,7 +333,7 @@ detect_mac80211() {
 		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
 
 		cat <<EOF
-config wifi-device  wifi$devidx
+config wifi-device  radio$devidx
 	option type     mac80211
 	option channel  ${channel}
 	option macaddr	$(cat /sys/class/ieee80211/${dev}/macaddress)
@@ -328,13 +343,14 @@ config wifi-device  wifi$devidx
 $ht_capab
 
 config wifi-iface
-	option device   wifi$devidx
+	option device   radio$devidx
 	option network  lan
 	option mode     ap
 	option ssid     OpenWrt
 	option encryption none
 
 EOF
+	devidx=$(($devidx + 1))
 	done
 }