X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F520-ath9k_ack_timeout_workaround.patch;h=f489f0ff4cb13354cbe94708642bef045f1eda72;hp=7b51204a54451a82c0790a484e805d27efd1ecbc;hb=c3e124355806ce269251cfcb072cbe1a817eac60;hpb=ed3a5c6bfdd273bd2aa92422382924dc2c24bf36

diff --git a/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch b/package/mac80211/patches/520-ath9k_ack_timeout_workaround.patch
index 7b51204a5..f489f0ff4 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
-@@ -1228,6 +1228,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);