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 | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (patch) | |
tree | 64cea72dc0e5975d838ee1119c3c6b938b9d7435 /package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch | |
parent | 87e7581aed0b3df30c2f77eda387806f7c2b824c (diff) | |
download | master-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/543-ath9k_entropy_from_adc.patch')
-rw-r--r-- | package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch index 3c0a260351..a8f1999453 100644 --- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch +++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch @@ -18,7 +18,7 @@ void (*spectral_scan_trigger)(struct ath_hw *ah); --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c -@@ -1999,6 +1999,26 @@ void ar9003_hw_init_rate_txpower(struct +@@ -1999,6 +1999,26 @@ void ar9003_hw_init_rate_txpower(struct } } @@ -84,7 +84,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, const struct ath_bus_ops *bus_ops) { -@@ -940,6 +953,8 @@ int ath9k_init_device(u16 devid, struct +@@ -940,6 +953,8 @@ int ath9k_init_device(u16 devid, struct ARRAY_SIZE(ath9k_tpt_blink)); #endif @@ -110,7 +110,7 @@ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable) --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c -@@ -1316,9 +1316,30 @@ void ar5008_hw_init_rate_txpower(struct +@@ -1316,9 +1316,30 @@ void ar5008_hw_init_rate_txpower(struct } } |