aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-15 17:55:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-09-15 17:55:16 +0000
commitb65db4089dfd161286634ec82c7aaec11dc84ac4 (patch)
treeaa6b1ef5eb5fa5afdaa907307757781f101bf85f /package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch
parent9ac95ba999b6908e5d57d661c9ebe3f638ceaf6e (diff)
downloadupstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.gz
upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.bz2
upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.zip
mac80211: update to wireless-testing 2011-09-14
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28245 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch')
-rw-r--r--package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch b/package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch
index c0a6bf3ffd..282c63a3f1 100644
--- a/package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch
+++ b/package/mac80211/patches/520-mac80211_minstrel_ht_aggr_delay.patch
@@ -27,12 +27,12 @@
ieee80211_start_tx_ba_session(pubsta, tid, 5000);
}
-@@ -452,7 +460,7 @@ minstrel_ht_tx_status(void *priv, struct
-
+@@ -453,7 +461,7 @@ minstrel_ht_tx_status(void *priv, struct
if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
minstrel_ht_update_stats(mp, mi);
-- minstrel_aggr_check(mp, sta, skb);
-+ minstrel_aggr_check(mp, mi, sta, skb);
+ if (!(info->flags & IEEE80211_TX_CTL_AMPDU))
+- minstrel_aggr_check(mp, sta, skb);
++ minstrel_aggr_check(mp, mi, sta, skb);
}
}