072937888e
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
18 lines
500 B
Diff
18 lines
500 B
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -388,13 +388,8 @@ static void ath9k_hw_init_config(struct
|
|
|
|
ah->config.rx_intr_mitigation = true;
|
|
|
|
- if (AR_SREV_9300_20_OR_LATER(ah)) {
|
|
- ah->config.rimt_last = 500;
|
|
- ah->config.rimt_first = 2000;
|
|
- } else {
|
|
- ah->config.rimt_last = 250;
|
|
- ah->config.rimt_first = 700;
|
|
- }
|
|
+ ah->config.rimt_last = 250;
|
|
+ ah->config.rimt_first = 500;
|
|
|
|
/*
|
|
* We need this for PCI devices only (Cardbus, PCI, miniPCI)
|