diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-09-14 15:24:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-16 16:45:41 -0400 |
| commit | bdf2dbfb084f421dc6dc2f2234194ddb6ec2ea8d (patch) | |
| tree | 0f46b84ab183f53aa1b3384f28f6ae67a78ab16b /drivers | |
| parent | c6c539f023423a7a730f5759be1b3b45c2d1d1ca (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 3 |
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 7f8191eddeb..634a29a946d 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, | |||
| 790 | } | 790 | } |
| 791 | 791 | ||
| 792 | tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); | 792 | tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); |
| 793 | if (nframes && ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) || | 793 | if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) |
| 794 | !(tx_info->control.rates[0].flags & IEEE80211_TX_RC_MCS))) | ||
| 795 | break; | 794 | break; |
| 796 | 795 | ||
| 797 | /* do not exceed subframe limit */ | 796 | /* do not exceed subframe limit */ |