This is handled in minstrel_ht now. No need to special case it here again. Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx> Cc: Ivo Van Doorn <ivdoorn@xxxxxxxxx> Cc: Gertjan van Wingerde <gwingerde@xxxxxxxxx> --- Ivo, I'm sending this directly to John due to the dependency on the minstrel_ht patch. drivers/net/wireless/rt2x00/rt2x00queue.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index ba0d7e6..033d2cd 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -330,11 +330,9 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, } /* - * This frame is eligible for an AMPDU, however, don't aggregate - * frames that are intended to probe a specific tx rate. + * This frame is eligible for an AMPDU. */ - if (tx_info->flags & IEEE80211_TX_CTL_AMPDU && - !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) + if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) __set_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags); /* -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
