summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.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-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
parent4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff)
downloadmtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.zip
mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz
mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2
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-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch')
-rw-r--r--package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch b/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
index 00f80b0..b79b4be 100644
--- a/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
+++ b/package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch
@@ -34,7 +34,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
*/
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4650,6 +4650,30 @@ static int rt2800_init_registers(struct
+@@ -4650,6 +4650,30 @@ static int rt2800_init_registers(struct
if (ret)
return ret;