From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 27 Aug 2011 23:53:49 +0000 (+0000)
Subject: ath9k: fix cts timeout setting on 2.4 ghz
X-Git-Tag: reboot~15980
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8d25adf5655a42b404c21e7b3db5255809327a02;p=openwrt%2Fstaging%2Fpepe2k.git

ath9k: fix cts timeout setting on 2.4 ghz

SVN-Revision: 28094
---

diff --git a/package/mac80211/patches/570-ath9k_fix_ack_cts_timeout.patch b/package/mac80211/patches/570-ath9k_fix_ack_cts_timeout.patch
new file mode 100644
index 0000000000..27055582cb
--- /dev/null
+++ b/package/mac80211/patches/570-ath9k_fix_ack_cts_timeout.patch
@@ -0,0 +1,28 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -969,7 +969,7 @@ void ath9k_hw_init_global_settings(struc
+ 	struct ath_common *common = ath9k_hw_common(ah);
+ 	struct ieee80211_conf *conf = &common->hw->conf;
+ 	const struct ath9k_channel *chan = ah->curchan;
+-	int acktimeout;
++	int acktimeout, ctstimeout;
+ 	int slottime;
+ 	int sifstime;
+ 	int rx_lat = 0, tx_lat = 0, eifs = 0;
+@@ -1026,6 +1026,7 @@ void ath9k_hw_init_global_settings(struc
+ 
+ 	/* As defined by IEEE 802.11-2007 17.3.8.6 */
+ 	acktimeout = slottime + sifstime + 3 * ah->coverage_class;
++	ctstimeout = acktimeout;
+ 
+ 	/*
+ 	 * Workaround for early ACK timeouts, add an offset to match the
+@@ -1040,7 +1041,7 @@ void ath9k_hw_init_global_settings(struc
+ 	ath9k_hw_set_sifs_time(ah, sifstime);
+ 	ath9k_hw_setslottime(ah, slottime);
+ 	ath9k_hw_set_ack_timeout(ah, acktimeout);
+-	ath9k_hw_set_cts_timeout(ah, acktimeout);
++	ath9k_hw_set_cts_timeout(ah, ctstimeout);
+ 	if (ah->globaltxtimeout != (u32) -1)
+ 		ath9k_hw_set_global_txtimeout(ah, ah->globaltxtimeout);
+