---

yaml --- r: 266008 b: refs/heads/master c: 64ed5cf h: refs/heads/master v: v3
git-mirror · Sep 14, 2011 · 75ae7ed · 75ae7ed
1 parent 422e0ad
commit 75ae7ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}
 }