ath9k: fix sampling frame handling wrt. aggregation, replace minstrel_ht performance...

[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 a963db8..a00cdee 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -214,6 +214,8 @@ enable_mac80211() {
        config_get txpower "$device" txpower
        config_get country "$device" country
        config_get distance "$device" distance
        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
        find_mac80211_phy "$device" || return 0
        config_get phy "$device" phy
        local i=0


@@ -227,6 +229,8 @@ enable_mac80211() {
        }
 
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
        }
 
        [ -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
 
        export channel fixed
        # convert channel to frequency


@@ -318,16 +322,6 @@ enable_mac80211() {
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
                [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
                # 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=
        done
 
        local start_hostapd=


@@ -410,7 +404,7 @@ detect_mac80211() {
 
                mode_11n=""
                mode_band="g"
 
                mode_11n=""
                mode_band="g"

-               channel="5"
+               channel="11"

                ht_cap=0
                for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
                        ht_cap="$(($ht_cap | $cap))"
                ht_cap=0
                for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
                        ht_cap="$(($ht_cap | $cap))"