aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-02-15 17:28:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-02-15 17:28:52 +0000
commit69d4a1e9b8776fe321cf077d7abfb2b1a13586fe (patch)
treea3650e06dc60eefba91fe612733c4d05f40de791 /package/mac80211
parent8886484603631b5be3da3a2cbd0951862c92579b (diff)
downloadupstream-69d4a1e9b8776fe321cf077d7abfb2b1a13586fe.tar.gz
upstream-69d4a1e9b8776fe321cf077d7abfb2b1a13586fe.tar.bz2
upstream-69d4a1e9b8776fe321cf077d7abfb2b1a13586fe.zip
ath9k: adjust ack timeout workaround patch based on upstream submission
SVN-Revision: 19638
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch12
1 files changed, 9 insertions, 3 deletions
diff --git a/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch b/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch
index 398bec8eb8..f489f0ff4c 100644
--- a/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch
+++ b/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch
@@ -1,13 +1,19 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1233,6 +1233,11 @@ void ath9k_hw_init_global_settings(struc
+@@ -1233,6 +1233,17 @@ void ath9k_hw_init_global_settings(struc
/* As defined by IEEE 802.11-2007 17.3.8.6 */
slottime = ah->slottime + 3 * ah->coverage_class;
acktimeout = slottime + sifstime;
+
-+ /* Workaround for a hw issue */
++ /*
++ * Workaround for early ACK timeouts, add an offset to match the
++ * initval's 64us ack timeout value.
++ * This was initially only meant to work around an issue with delayed
++ * BA frames in some implementations, but it has been found to fix ACK
++ * timeout issues in other cases as well.
++ */
+ if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
-+ acktimeout = max(64, acktimeout);
++ acktimeout += 64 - sifstime - ah->slottime;
+
ath9k_hw_setslottime(ah, slottime);
ath9k_hw_set_ack_timeout(ah, acktimeout);