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/324-ath9k-add-new-function-ath9k_hw_read_array.patch | |
parent | 4bb7b2186ef9c56655c0bd035ae2740888c751a9 (diff) | |
download | mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.zip mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.gz mtk-20170518-072937888e133f5e97fd05a7496eaf7eeae04079.tar.bz2 |
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/324-ath9k-add-new-function-ath9k_hw_read_array.patch')
-rw-r--r-- | package/kernel/mac80211/patches/324-ath9k-add-new-function-ath9k_hw_read_array.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/324-ath9k-add-new-function-ath9k_hw_read_array.patch b/package/kernel/mac80211/patches/324-ath9k-add-new-function-ath9k_hw_read_array.patch index 41c6ff5..2eda1c9 100644 --- a/package/kernel/mac80211/patches/324-ath9k-add-new-function-ath9k_hw_read_array.patch +++ b/package/kernel/mac80211/patches/324-ath9k-add-new-function-ath9k_hw_read_array.patch @@ -11,7 +11,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -121,6 +121,36 @@ void ath9k_hw_write_array(struct ath_hw +@@ -121,6 +121,36 @@ void ath9k_hw_write_array(struct ath_hw REGWRITE_BUFFER_FLUSH(ah); } @@ -59,7 +59,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT 0 #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1 -@@ -1020,6 +1022,7 @@ void ath9k_hw_synth_delay(struct ath_hw +@@ -1020,6 +1022,7 @@ void ath9k_hw_synth_delay(struct ath_hw bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array, int column, unsigned int *writecnt); |