From 75ae7edb432cae276d4f045faadef6b52e3f21d9 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 3 Sep 2011 09:06:20 +0200
Subject: [PATCH] --- yaml --- r: 266008 b: refs/heads/master c:
 64ed5cf01345da60b5fd9f27e22e5e2e2ffb0a33 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/net/mac80211/rc80211_minstrel_ht.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b1ce72ccc37d..855be44fd56f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43c3528430bd29f5e52438cad7cf7c0c62bf4583
+refs/heads/master: 64ed5cf01345da60b5fd9f27e22e5e2e2ffb0a33
diff --git a/trunk/net/mac80211/rc80211_minstrel_ht.c b/trunk/net/mac80211/rc80211_minstrel_ht.c
index 21588386a302..e19249b0f971 100644
--- a/trunk/net/mac80211/rc80211_minstrel_ht.c
+++ b/trunk/net/mac80211/rc80211_minstrel_ht.c
@@ -452,7 +452,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
 
 	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);
+		if (!(info->flags & IEEE80211_TX_CTL_AMPDU))
+			minstrel_aggr_check(mp, sta, skb);
 	}
 }