---

yaml --- r: 266079 b: refs/heads/master c: bdf2dbf h: refs/heads/master i: 266077: 94725c0 266075: 53047a0 266071: 1b25886 266063: e1a9cdf 266047: e3db1ea v: v3
git-mirror · Sep 16, 2011 · b712b77 · b712b77
1 parent 31b76c3
commit b712b77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6c539f023423a7a730f5759be1b3b45c2d1d1ca
+refs/heads/master: bdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d
diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
@@ -790,8 +790,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
 		}
 
 		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)))
+		if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
 			break;
 
 		/* do not exceed subframe limit */