---

yaml --- r: 224691 b: refs/heads/master c: 48124d1 h: refs/heads/master i: 224689: 71de799 224687: 222f862 v: v3
git-mirror · Nov 24, 2010 · e23e8fd · e23e8fd
1 parent 70cd7ce
commit e23e8fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8b576061d87e2a4fb100e70c6a6dae189b3a310
+refs/heads/master: 48124d1a91fb77defc9734b4556350d59671fb2c
diff --git a/trunk/net/mac80211/rc80211_minstrel_ht.c b/trunk/net/mac80211/rc80211_minstrel_ht.c
@@ -371,6 +371,9 @@ minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, stru
 	if (likely(sta->ampdu_mlme.tid_tx[tid]))
 		return;
 
+	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+		return;
+
 	ieee80211_start_tx_ba_session(pubsta, tid);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	if (likely(sta->ampdu_mlme.tid_tx[tid]))
     		return;
+    	if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+    		return;
     	ieee80211_start_tx_ba_session(pubsta, tid);
     }
@@ Expand Down @@