X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8a11ffce727cd0a8a0578a5c3359c21c04539a06..7406bafce9bc69a29abf1f324a649735687c57fc:/package/mac80211/files/lib/wifi/mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index b7984a3b7..6d144a95c 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -76,11 +76,13 @@ enable_mac80211() {
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
 	config_get txpower "$device" txpower
+	config_get country "$device" country
 	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
 	}
@@ -125,7 +127,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"
@@ -134,7 +136,7 @@ enable_mac80211() {
 		esac
 
 		# All interfaces must have unique mac addresses
-		# which can either be explicitly set in the device 
+		# which can either be explicitly set in the device
 		# section, or automatically generated
 		config_get macaddr "$device" macaddr
 		local mac_1="${macaddr%%:*}"
@@ -142,7 +144,7 @@ enable_mac80211() {
 
 		config_get vif_mac "$vif" macaddr
 		[ -n "$vif_mac" ] || {
-			if [ "$i" -gt 0 ]; then 
+			if [ "$i" -gt 0 ]; then
 				offset="$(( 2 + $i * 4 ))"
 			else
 				offset="0"
@@ -168,7 +170,7 @@ enable_mac80211() {
 		# none -> NO encryption
 		#
 		# wep + keymgmt = '' -> we use iw to connect to the
-		# network.  
+		# network.
 		#
 		# wep + keymgmt = 'NONE' -> wpa_supplicant will be
 		# configured to handle the wep connection
@@ -176,18 +178,18 @@ enable_mac80211() {
 			case "$enc" in
 				wep)
 					config_get keymgmt "$vif" keymgmt
-					if [ -e "$keymgmt" ]; then
+					if [ -n "$keymgmt" ]; then
 						for idx in 1 2 3 4; do
 							local zidx
-							zidx = idx - 1
+							zidx=$(($idx - 1))
 							config_get key "$vif" "key${idx}"
 							if [ -n "$key" ]; then
-								append keystring "${zidx}:${key} " 
+								append keystring "${zidx}:${key} "
 							fi
 						done
 					fi
 				;;
-				wpa)
+				*wpa*|*psk*)
 					config_get key "$vif" key
 				;;
 			esac
@@ -207,7 +209,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
@@ -238,9 +240,9 @@ enable_mac80211() {
 			;;
 			sta|mesh)
 				config_get bssid "$vif" bssid
-				case "$enc" in												 
+				case "$enc" in
 					wep)
-						if [ -e "$keymgmt" ]; then
+						if [ -n "$keymgmt" ]; then
 							[ -n "$keystring" ] &&
 								iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key "$keystring"
 						else
@@ -254,7 +256,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 || {
@@ -288,16 +290,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"
@@ -315,10 +317,10 @@ detect_mac80211() {
 			[ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list	SHORT-GI-40" "$N"
 			[ "$(($ht_cap & 4096))" -eq 4096 ] && append ht_capab "$list	DSSS_CCK-40" "$N"
 		}
-		iw phy "$dev" info | grep -q '2412 MHz' || mode_band="a"; channel="36"
+		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 +330,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
 }