mac80211: ignore errors in the command to set the rx/tx antenna - many drivers do...

[openwrt.git] / 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 e865a8b..ac1562f 100644 (file)
--- 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 >/dev/null 2>&1
 
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
        [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
@@ -411,6 +410,7 @@ enable_mac80211() {
                                                                                [ $idx -eq $key ] && ikey="d:$ikey"
                                                                                append keyspec "$ikey"
                                                                        }
+                                                               done
                                                        ;;
                                                        *) append keyspec "d:0:$(prepare_key_wep "$key")" ;;
                                                esac
@@ -425,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)