summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-21 00:33:00 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-21 00:33:00 +0000
commit9cdf3516e5f0beec6aa8b8dd97f9b544b515941d (patch)
tree5274855b8584974798f8a6fe242d5f300115686f /package/mac80211/patches/560-ath9k_aggr_sampling_fix.patch
parent2a19def0710bd23c2868a45c7746f247a4b632bb (diff)
ath9k: fix sampling frame handling wrt. aggregation, replace minstrel_ht performance fixes for better performance
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23558 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..66a341901
--- /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;