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/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch | |
parent | 4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff) | |
download | master-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/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch')
-rw-r--r-- | package/kernel/mac80211/patches/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch b/package/kernel/mac80211/patches/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch index 6420eeddcf..a22cd1d490 100644 --- a/package/kernel/mac80211/patches/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch +++ b/package/kernel/mac80211/patches/326-ath9k-use-one-shot-read-in-ath9k_hw_update_mibstats.patch @@ -10,7 +10,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- a/drivers/net/wireless/ath/ath9k/ani.c +++ b/drivers/net/wireless/ath/ath9k/ani.c -@@ -107,11 +107,21 @@ static const struct ani_cck_level_entry +@@ -107,11 +107,21 @@ static const struct ani_cck_level_entry static void ath9k_hw_update_mibstats(struct ath_hw *ah, struct ath9k_mib_stats *stats) { |