aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.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
commit19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (patch)
tree64cea72dc0e5975d838ee1119c3c6b938b9d7435 /package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
parent87e7581aed0b3df30c2f77eda387806f7c2b824c (diff)
downloadupstream-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/300-mac80211-add-an-intermediate-software-queue-implemen.patch')
-rw-r--r--package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch b/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
index d8ea82269b..237121ba27 100644
--- a/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
+++ b/package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch
@@ -331,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
-@@ -118,6 +118,16 @@ static void __cleanup_single_sta(struct
+@@ -118,6 +118,16 @@ static void __cleanup_single_sta(struct
atomic_dec(&ps->num_sta_ps);
}