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 | 072937888e133f5e97fd05a7496eaf7eeae04079 (patch) | |
| tree | 0feb87d5e07d42b118e3231b8261a2610b364c83 /package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch | |
| parent | 4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff) | |
| download | upstream-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/300-mac80211-add-an-intermediate-software-queue-implemen.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/300-mac80211-add-an-intermediate-software-queue-implemen.patch | 2 |
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); } |