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/090-linux_3_18_12_compat.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/090-linux_3_18_12_compat.patch')
-rw-r--r-- | package/kernel/mac80211/patches/090-linux_3_18_12_compat.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/090-linux_3_18_12_compat.patch b/package/kernel/mac80211/patches/090-linux_3_18_12_compat.patch new file mode 100644 index 0000000000..85c52807fe --- /dev/null +++ b/package/kernel/mac80211/patches/090-linux_3_18_12_compat.patch @@ -0,0 +1,29 @@ +--- a/backport-include/linux/wait.h ++++ b/backport-include/linux/wait.h +@@ -23,7 +23,7 @@ backport_wait_on_bit_io(void *word, int + + #endif + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,12) + #define WQ_FLAG_WOKEN 0x02 + + #define wait_woken LINUX_BACKPORT(wait_woken) +--- a/compat/backport-3.19.c ++++ b/compat/backport-3.19.c +@@ -15,6 +15,7 @@ + #include <linux/netdevice.h> + #include <linux/debugfs.h> + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,12) + static inline bool is_kthread_should_stop(void) + { + return (current->flags & PF_KTHREAD) && kthread_should_stop(); +@@ -79,6 +80,7 @@ int woken_wake_function(wait_queue_t *wa + return default_wake_function(wait, mode, sync, key); + } + EXPORT_SYMBOL(woken_wake_function); ++#endif + + #ifdef __BACKPORT_NETDEV_RSS_KEY_FILL + u8 netdev_rss_key[NETDEV_RSS_KEY_LEN]; |