diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2008-08-11 14:01:49 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:03 -0400 |
| commit | 580f0b8a6dc1cb4d32c351a507d1c1d319bdc1eb (patch) | |
| tree | 53704fd36f81c691f20aac3fc767cd9960894b75 /drivers/net/wireless/ath9k/main.c | |
| parent | a8fff50e4d6aad520b261b3c32e2c67a7dfb7228 (diff) | |
| download | blackbird-op-linux-580f0b8a6dc1cb4d32c351a507d1c1d319bdc1eb.tar.gz blackbird-op-linux-580f0b8a6dc1cb4d32c351a507d1c1d319bdc1eb.zip | |
ath9k: Fix TX status reporting
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index f904cf67dba8..4b61666261e3 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -1085,8 +1085,16 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; tx_status->flags &= ~ATH_TX_BAR; } - if (tx_status->flags) - tx_info->status.excessive_retries = 1; + + if (tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY)) { + if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) { + /* Frame was not ACKed, but an ACK was expected */ + tx_info->status.excessive_retries = 1; + } + } else { + /* Frame was ACKed */ + tx_info->flags |= IEEE80211_TX_STAT_ACK; + } tx_info->status.retry_count = tx_status->retries; |
