ath9k: remove a redundant check in ath_tx_form_aggr
authorFelix Fietkau <nbd@openwrt.org>
Wed, 14 Sep 2011 19:24:25 +0000 (21:24 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Sep 2011 20:45:41 +0000 (16:45 -0400)
ath_lookup_legacy now checks all the tx rate flags for MCS vs legacy

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/xmit.c

index 7f8191eddebe91e83d14ba6ffe15f1f235cd627a..634a29a946d30bcca06833e82e4e63189c1c0a64 100644 (file)
@@ -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 */