diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:04:04 +0200 |
| commit | 8040d77688014987ca5738bf1731db72ab273441 (patch) | |
| tree | 99caf0f4ca88eeeb6e2b812a4002c5c0387f3ef9 /drivers/net/wireless/ath9k/main.c | |
| parent | fb481dd56adf3c5b0993b8f052cc9ba966e3959d (diff) | |
| parent | 268364a0f48aee2f851f9d1ef8a6cda0f3039ef1 (diff) | |
Merge branch 'core/resources' into x86/core
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 95b33714948..c5107f269f2 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c @@ -1067,8 +1067,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; |