diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:16 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:16 +0000 |
| commit | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (patch) | |
| tree | 64cea72dc0e5975d838ee1119c3c6b938b9d7435 /package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch | |
| parent | 87e7581aed0b3df30c2f77eda387806f7c2b824c (diff) | |
| download | upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.gz upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.bz2 upstream-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45710 3c298f89-4303-0410-b956-a3cf2f4a3e73
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-.patch | 18 |
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); + } + |