[backfire] merge r22355

SVN-Revision: 22356

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index c871cbe7328419a75440e4a2b63434bb17a8f819..4390b657f91687ec333c1d88eabc532fa015f8fa 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -206,6 +206,8 @@ enable_mac80211() {
        config_get txpower "$device" txpower
        config_get country "$device" country
        config_get distance "$device" distance
+       config_get frag "$device" frag
+       config_get rts "$device" rts
        find_mac80211_phy "$device" || return 0
        config_get phy "$device" phy
        local i=0
@@ -219,6 +221,8 @@ enable_mac80211() {
        }
 
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
+       [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
+       [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
 
        export channel fixed
        # convert channel to frequency
@@ -310,16 +314,6 @@ enable_mac80211() {
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
                [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
-
-               config_get frag "$vif" frag
-               if [ -n "$frag" ]; then
-                       iw phy "$phy" set frag "${frag%%.*}"
-               fi
-
-               config_get rts "$vif" rts
-               if [ -n "$rts" ]; then
-                       iw phy "$phy" set rts "${rts%%.*}"
-               fi
        done
 
        local start_hostapd=