X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9afe60a2f40d62a5b377c40de5a032a04be6d536..ddc9278d09957a5c6cb27ad0ca696f096476e38a:/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 3a8b116d1..13d6584b0 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -239,8 +239,8 @@ enable_mac80211() {
 	config_get txpower "$device" txpower
 	config_get country "$device" country
 	config_get distance "$device" distance
-	config_get txantenna "$device" txantenna
-	config_get rxantenna "$device" rxantenna
+	config_get txantenna "$device" txantenna all
+	config_get rxantenna "$device" rxantenna all
 	config_get frag "$device" frag
 	config_get rts "$device" rts
 	find_mac80211_phy "$device" || return 0
@@ -256,8 +256,7 @@ enable_mac80211() {
 		fixed=1
 	}
 
-	local antspec="${txantenna:+$txantenna }$rxantenna"
-	iw phy "$phy" set antenna ${antspec:-all}
+	iw phy "$phy" set antenna $txantenna $rxantenna
 
 	[ -n "$distance" ] && iw phy "$phy" set distance "$distance"
 	[ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
@@ -426,9 +425,9 @@ enable_mac80211() {
 
 					iw dev "$ifname" ibss join "$ssid" $freq \
 						${fixed:+fixed-freq} $bssid \
-						${mcval:+mcast-rate $mcval} \
 						${bintval:+beacon-interval $bintval} \
 						${basicrates:+basic-rates $basicrates} \
+						${mcval:+mcast-rate $mcval} \
 						${keyspec:+keys $keyspec}
 				;;
 				sta)