aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-03 10:23:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-02-03 10:23:55 +0000
commit923b5ec22795bcba808b059e1b7af04bdc409e2b (patch)
treed282547e893380aff125e4c25651387625d22963
parentf712c0de7ed4f49eac637e631ef025019cee41a5 (diff)
downloadupstream-923b5ec22795bcba808b059e1b7af04bdc409e2b.tar.gz
upstream-923b5ec22795bcba808b059e1b7af04bdc409e2b.tar.bz2
upstream-923b5ec22795bcba808b059e1b7af04bdc409e2b.zip
ath9k: fix CTS timeout issues in 2.4 ghz
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30010 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/569-ath9k_fix_cts.patch21
-rw-r--r--package/mac80211/patches/571-ath9k_btcoex_optional.patch2
2 files changed, 22 insertions, 1 deletions
diff --git a/package/mac80211/patches/569-ath9k_fix_cts.patch b/package/mac80211/patches/569-ath9k_fix_cts.patch
new file mode 100644
index 0000000000..fefa0651e2
--- /dev/null
+++ b/package/mac80211/patches/569-ath9k_fix_cts.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1061,13 +1061,16 @@ void ath9k_hw_init_global_settings(struc
+
+ /*
+ * Workaround for early ACK timeouts, add an offset to match the
+- * initval's 64us ack timeout value.
++ * initval's 64us ack timeout value. Use 48us for the CTS timeout.
+ * 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)
++ if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
+ acktimeout += 64 - sifstime - ah->slottime;
++ ctstimeout += 48 - sifstime - ah->slottime;
++ }
++
+
+ ath9k_hw_set_sifs_time(ah, sifstime);
+ ath9k_hw_setslottime(ah, slottime);
diff --git a/package/mac80211/patches/571-ath9k_btcoex_optional.patch b/package/mac80211/patches/571-ath9k_btcoex_optional.patch
index c73ad1a4f3..046a35777f 100644
--- a/package/mac80211/patches/571-ath9k_btcoex_optional.patch
+++ b/package/mac80211/patches/571-ath9k_btcoex_optional.patch
@@ -203,7 +203,7 @@
if (btcoex->hw_timer_enabled)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1929,7 +1929,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1932,7 +1932,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
#endif
}