aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.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/802-libertas-set-wireless-macaddr.patch
parent87e7581aed0b3df30c2f77eda387806f7c2b824c (diff)
downloadmaster-187ad058-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.gz
master-187ad058-19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd.tar.bz2
master-187ad058-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/802-libertas-set-wireless-macaddr.patch')
-rw-r--r--package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
index 337242b844..252fa810b0 100644
--- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
+++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
-@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
+@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
wdev->wiphy->reg_notifier = lbs_reg_notifier;