diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-31 06:34:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-31 06:34:53 +0000 |
| commit | 264587e8f406497c150db71386544d89093599e3 (patch) | |
| tree | 41034ee2f233f38f40f2d575eb10036a9a34d1eb /package/mac80211/patches/300-pending_work.patch | |
| parent | 2c5f8a59db59c4b6a2c40817321e8686ea361cfd (diff) | |
| download | upstream-264587e8f406497c150db71386544d89093599e3.tar.gz upstream-264587e8f406497c150db71386544d89093599e3.tar.bz2 upstream-264587e8f406497c150db71386544d89093599e3.zip | |
ath9k: merge a pending fix for 5 ghz rx latency
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 01df8f7456..ce766af82e 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -258,7 +258,28 @@ if (AR_SREV_9340(ah) && !ah->is_clk_25mhz) --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -997,8 +997,14 @@ void ath9k_hw_init_global_settings(struc +@@ -975,7 +975,10 @@ void ath9k_hw_init_global_settings(struc + if (ah->misc_mode != 0) + REG_SET_BIT(ah, AR_PCU_MISC, ah->misc_mode); + +- rx_lat = 37; ++ if (IS_CHAN_A_FAST_CLOCK(ah, chan)) ++ rx_lat = 41; ++ else ++ rx_lat = 37; + tx_lat = 54; + + if (IS_CHAN_HALF_RATE(chan)) { +@@ -989,7 +992,7 @@ void ath9k_hw_init_global_settings(struc + sifstime = 32; + } else if (IS_CHAN_QUARTER_RATE(chan)) { + eifs = 340; +- rx_lat *= 4; ++ rx_lat = (rx_lat * 4) - 1; + tx_lat *= 4; + if (IS_CHAN_A_FAST_CLOCK(ah, chan)) + tx_lat += 22; +@@ -997,8 +1000,14 @@ void ath9k_hw_init_global_settings(struc slottime = 21; sifstime = 64; } else { |