aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-21 00:33:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-21 00:33:00 +0000
commitad06ff1186a055552e4e430b1f40593b9668b439 (patch)
tree5dd7771323952cb141b4bd3c6a15c07b61426d09 /package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
parenta7bdb90f3843a2d36bc232781d670c72ab76a7d8 (diff)
downloadupstream-ad06ff1186a055552e4e430b1f40593b9668b439.tar.gz
upstream-ad06ff1186a055552e4e430b1f40593b9668b439.tar.bz2
upstream-ad06ff1186a055552e4e430b1f40593b9668b439.zip
ath9k: fix sampling frame handling wrt. aggregation, replace minstrel_ht performance fixes for better performance
SVN-Revision: 23558
Diffstat (limited to 'package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch')
-rw-r--r--package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch b/package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
new file mode 100644
index 0000000000..66a3419019
--- /dev/null
+++ b/package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -673,6 +673,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ u16 aggr_limit = 0, al = 0, bpad = 0,
+ al_delta, h_baw = tid->baw_size / 2;
+ enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
++ struct ieee80211_tx_info *tx_info;
+
+ bf_first = list_first_entry(&tid->buf_q, struct ath_buf, list);
+
+@@ -699,6 +700,11 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ break;
+ }
+
++ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
++ if (nframes && ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) ||
++ !(tx_info->control.rates[0].flags & IEEE80211_TX_RC_MCS)))
++ break;
++
+ /* do not exceed subframe limit */
+ if (nframes >= min((int)h_baw, ATH_AMPDU_SUBFRAME_DEFAULT)) {
+ status = ATH_AGGR_LIMITED;