summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.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/411-ath5k_allow_adhoc_and_ap.patch
parent4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff)
downloadmaster-31e0f0ae-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz
master-31e0f0ae-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2
master-31e0f0ae-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/411-ath5k_allow_adhoc_and_ap.patch')
-rw-r--r--package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
index 58dd26f260..2a5ab3d428 100644
--- a/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -86,13 +86,8 @@ ath5k_add_interface(struct ieee80211_hw
+@@ -86,13 +86,8 @@ ath5k_add_interface(struct ieee80211_hw
goto end;
}