aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-10-14 19:22:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-10-14 19:22:45 +0000
commit5d034a0e46673fa444d50ae9c90e58de59ffc350 (patch)
tree8675b28d968d690d7096b0eb6f2d325548518bfd
parentc6857dabc05c10eeb64da1835f63b880f7f1c33c (diff)
downloadupstream-5d034a0e46673fa444d50ae9c90e58de59ffc350.tar.gz
upstream-5d034a0e46673fa444d50ae9c90e58de59ffc350.tar.bz2
upstream-5d034a0e46673fa444d50ae9c90e58de59ffc350.zip
AA: ath5k: fix tx status processing errors (causing packet loss and throughput issues)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r38396 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@38397 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 127e777950..f3b9c71839 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1187,3 +1187,24 @@
tx->sdata->control_port_protocol == tx->skb->protocol) {
tx->sta = sta_info_get_bss(sdata, hdr->addr1);
}
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1628,15 +1628,15 @@ ath5k_tx_frame_completed(struct ath5k_hw
+ ah->stats.tx_bytes_count += skb->len;
+ info = IEEE80211_SKB_CB(skb);
+
++ size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates));
++ memcpy(info->status.rates, bf->rates, size);
++
+ tries[0] = info->status.rates[0].count;
+ tries[1] = info->status.rates[1].count;
+ tries[2] = info->status.rates[2].count;
+
+ ieee80211_tx_info_clear_status(info);
+
+- size = min_t(int, sizeof(info->status.rates), sizeof(bf->rates));
+- memcpy(info->status.rates, bf->rates, size);
+-
+ for (i = 0; i < ts->ts_final_idx; i++) {
+ struct ieee80211_tx_rate *r =
+ &info->status.rates[i];