diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-11-28 19:37:48 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-29 15:30:29 -0500 |
| commit | 8b7f8532d15631776ce8bec2bbbc58f6aad738d1 (patch) | |
| tree | 69241871c17e3244c7ce78e19749b079953e2cf3 | |
| parent | 81fc2a332045dc1dae24f24d3e2dc4656f2cc498 (diff) | |
| download | linux-stable-8b7f8532d15631776ce8bec2bbbc58f6aad738d1.tar.gz linux-stable-8b7f8532d15631776ce8bec2bbbc58f6aad738d1.tar.bz2 linux-stable-8b7f8532d15631776ce8bec2bbbc58f6aad738d1.zip | |
ath9k: fix software retry counter tracking
The recent tx path cleanups moved the software retry count tracking
from the ath_buf to the skb cb, however the actual counter update
referred to the wrong location, confusing block-ack window tracking.
Fix this by using the retries counter in the struct ath_frame_info.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 495432ec85a9..177a7b1de322 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -250,11 +250,11 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq, static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq, struct sk_buff *skb) { - struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); + struct ath_frame_info *fi = get_frame_info(skb); struct ieee80211_hdr *hdr; TX_STAT_INC(txq->axq_qnum, a_retries); - if (tx_info->control.rates[4].count++ > 0) + if (fi->retries++ > 0) return; hdr = (struct ieee80211_hdr *)skb->data; |