From b712b779b9ec3b9bf320333b1fa638a96130d697 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 14 Sep 2011 21:24:25 +0200
Subject: [PATCH] --- yaml --- r: 266079 b: refs/heads/master c:
 bdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d h: refs/heads/master i:   266077:
 94725c063c6c1387672d01fd790a7734002d8ef9   266075:
 53047a0fe781d49c74dbe990aae9a026e096797e   266071:
 1b258868982bd5a957817afe4fd907edb47bcbe4   266063:
 e1a9cdffbdb9c74934abd1c0bf76b4778ed4852d   266047:
 e3db1ead175afff4c9422ea31126feff055a5bea v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/xmit.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d4262750b0bb..7258577715d1 100644
--- 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
index 7f8191eddebe..634a29a946d3 100644
--- 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 */