2010-01-15 23:12:21 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
2010-02-15 17:28:52 +00:00
|
|
|
@@ -1233,6 +1233,17 @@ void ath9k_hw_init_global_settings(struc
|
2010-01-15 23:12:21 +00:00
|
|
|
/* As defined by IEEE 802.11-2007 17.3.8.6 */
|
|
|
|
slottime = ah->slottime + 3 * ah->coverage_class;
|
|
|
|
acktimeout = slottime + sifstime;
|
|
|
|
+
|
2010-02-15 17:28:52 +00:00
|
|
|
+ /*
|
|
|
|
+ * 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.
|
|
|
|
+ */
|
2010-01-15 23:12:21 +00:00
|
|
|
+ if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
|
2010-02-15 17:28:52 +00:00
|
|
|
+ acktimeout += 64 - sifstime - ah->slottime;
|
2010-01-15 23:12:21 +00:00
|
|
|
+
|
|
|
|
ath9k_hw_setslottime(ah, slottime);
|
|
|
|
ath9k_hw_set_ack_timeout(ah, acktimeout);
|
|
|
|
ath9k_hw_set_cts_timeout(ah, acktimeout);
|