aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:16 +0000
committerJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:16 +0000
commit072937888e133f5e97fd05a7496eaf7eeae04079 (patch)
tree0feb87d5e07d42b118e3231b8261a2610b364c83 /package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch
parent4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff)
downloadupstream-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz
upstream-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2
upstream-072937888e133f5e97fd05a7496eaf7eeae04079.zip
mac80211: make it work with 3.18.12+
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait: Provide infrastructure to deal with nested blocking") from 3.19, causing the following error on load: [ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel) Fix this by guarding it with a check for 3.18.11 or earlier instead of 3.19. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45710
Diffstat (limited to 'package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch')
-rw-r--r--package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch b/package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch
index 9f98cab60e..1cba4f68c1 100644
--- a/package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch
+++ b/package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch
@@ -110,10 +110,13 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
rt2800_bbp_write(rt2x00dev, 83, 0x9a);
if (rt2x00_has_cap_external_lna_a(rt2x00dev))
-@@ -3687,6 +3736,23 @@ static void rt2800_config_channel(struct
- usleep_range(1000, 1500);
- }
+@@ -3684,6 +3733,23 @@ static void rt2800_config_channel(struct
+
+ rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
++ usleep_range(1000, 1500);
++ }
++
+ if (rt2x00_rt(rt2x00dev, RT3883)) {
+ if (!conf_is_ht40(conf))
+ rt2800_bbp_write(rt2x00dev, 105, 0x34);
@@ -128,9 +131,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+
+ rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
+
-+ usleep_range(1000, 1500);
-+ }
-+
- if (rt2x00_rt(rt2x00dev, RT5592)) {
- rt2800_bbp_write(rt2x00dev, 195, 141);
- rt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);
+ usleep_range(1000, 1500);
+ }
+