aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-14 21:24:25 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-09-16 16:45:41 -0400
commitbdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d (patch)
tree0f46b84ab183f53aa1b3384f28f6ae67a78ab16b
parentath9k: optimize ath9k_ps_restore (diff)
downloadlinux-dev-bdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d.tar.xz
linux-dev-bdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d.zip
ath9k: remove a redundant check in ath_tx_form_aggr
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>
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 7f8191eddebe..634a29a946d3 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/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 */