---

yaml
---
r: 184101
b: refs/heads/master
c: 42c4568
h: refs/heads/master
i:
  184099: 1738ad5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cad6c7c38930618d77e65af82c1403d63879eee
+refs/heads/master: 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e

trunk/drivers/net/wireless/ath/ath9k/hw.c

@@ -1217,6 +1217,17 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
 	/* As defined by IEEE 802.11-2007 17.3.8.6 */
 	slottime = ah->slottime + 3 * ah->coverage_class;
 	acktimeout = slottime + sifstime;
+
+	/*
+	 * 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 += 64 - sifstime - ah->slottime;
+
 	ath9k_hw_setslottime(ah, slottime);
 	ath9k_hw_set_ack_timeout(ah, acktimeout);
 	ath9k_hw_set_cts_timeout(ah, acktimeout);