diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-09-26 12:18:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 15:56:57 -0400 |
commit | 185d1589ccc9f49afcdaede480523df2bfec7c01 (patch) | |
tree | 62268a4f05c7a469e7e9893ec1b972434d68e4ba /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | 89888e368eebb8d5c3dbf58425b95fc773aee511 (diff) |
ath9k: Remove unnecessary AMPDU check at tx status
Fill the ampdu_[ack]_len for both aggregation and normal frames.
So that we could avoid unnecesary conditional at tx status.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index fa3dcfdf717..f5d4764888b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -2043,10 +2043,9 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, | |||
2043 | tx_info->flags |= IEEE80211_TX_STAT_AMPDU; | 2043 | tx_info->flags |= IEEE80211_TX_STAT_AMPDU; |
2044 | 2044 | ||
2045 | BUG_ON(nbad > nframes); | 2045 | BUG_ON(nbad > nframes); |
2046 | |||
2047 | tx_info->status.ampdu_len = nframes; | ||
2048 | tx_info->status.ampdu_ack_len = nframes - nbad; | ||
2049 | } | 2046 | } |
2047 | tx_info->status.ampdu_len = nframes; | ||
2048 | tx_info->status.ampdu_ack_len = nframes - nbad; | ||
2050 | 2049 | ||
2051 | if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 && | 2050 | if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 && |
2052 | (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) == 0) { | 2051 | (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) == 0) { |