summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-27 23:53:49 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-27 23:53:49 +0000
commit3b3f7e203dd94995eb34a385bca33cc7282a4b8d (patch)
tree4eedce81747a0bc4dddac3f440acd5c06a17f711
parenta9aed914cf586cba100ca6b94079c3a8c5428ab4 (diff)
ath9k: fix cts timeout setting on 2.4 ghz
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28094 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/570-ath9k_fix_ack_cts_timeout.patch28
1 files changed, 28 insertions, 0 deletions
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 000000000..27055582c
--- /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);
+