diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-27 15:43:12 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-27 15:43:28 +0100 |
| commit | 82d580e8b5c43f4dd228f2bb5927ca3e47752a34 (patch) | |
| tree | 1c9a392d3b54a0ff51449063e50d7517ffc2902c /package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch | |
| parent | fe12d51cd49ddad71b16839eef10f9d307241e7a (diff) | |
| download | upstream-82d580e8b5c43f4dd228f2bb5927ca3e47752a34.tar.gz upstream-82d580e8b5c43f4dd228f2bb5927ca3e47752a34.tar.bz2 upstream-82d580e8b5c43f4dd228f2bb5927ca3e47752a34.zip | |
ath9k: fix up a refcount imbalance error in the IRQ related fix
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch b/package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch index 962a08ae36..3e1b2a1714 100644 --- a/package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch +++ b/package/kernel/mac80211/patches/357-ath9k-fix-race-condition-in-enabling-disabling-IRQs.patch @@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -375,9 +375,14 @@ void ath9k_tasklet(unsigned long data) +@@ -375,21 +375,20 @@ void ath9k_tasklet(unsigned long data) struct ath_common *common = ath9k_hw_common(ah); enum ath_reset_type type; unsigned long flags; @@ -134,7 +134,39 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ath9k_ps_wakeup(sc); spin_lock(&sc->sc_pcu_lock); -@@ -480,7 +485,7 @@ void ath9k_tasklet(unsigned long data) + if (status & ATH9K_INT_FATAL) { + type = RESET_TYPE_FATAL_INT; + ath9k_queue_reset(sc, type); +- +- /* +- * Increment the ref. counter here so that +- * interrupts are enabled in the reset routine. +- */ +- atomic_inc(&ah->intr_ref_cnt); + ath_dbg(common, RESET, "FATAL: Skipping interrupts\n"); + goto out; + } +@@ -405,11 +404,6 @@ void ath9k_tasklet(unsigned long data) + type = RESET_TYPE_BB_WATCHDOG; + ath9k_queue_reset(sc, type); + +- /* +- * Increment the ref. counter here so that +- * interrupts are enabled in the reset routine. +- */ +- atomic_inc(&ah->intr_ref_cnt); + ath_dbg(common, RESET, + "BB_WATCHDOG: Skipping interrupts\n"); + goto out; +@@ -422,7 +416,6 @@ void ath9k_tasklet(unsigned long data) + if ((sc->gtt_cnt >= MAX_GTT_CNT) && !ath9k_hw_check_alive(ah)) { + type = RESET_TYPE_TX_GTT; + ath9k_queue_reset(sc, type); +- atomic_inc(&ah->intr_ref_cnt); + ath_dbg(common, RESET, + "GTT: Skipping interrupts\n"); + goto out; +@@ -480,7 +473,7 @@ void ath9k_tasklet(unsigned long data) ath9k_btcoex_handle_interrupt(sc, status); /* re-enable hardware interrupt */ @@ -143,7 +175,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> out: spin_unlock(&sc->sc_pcu_lock); ath9k_ps_restore(sc); -@@ -544,7 +549,9 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -544,7 +537,9 @@ irqreturn_t ath_isr(int irq, void *dev) return IRQ_NONE; /* Cache the status */ @@ -154,7 +186,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (status & SCHED_INTR) sched = true; -@@ -590,7 +597,7 @@ chip_reset: +@@ -590,7 +585,7 @@ chip_reset: if (sched) { /* turn off every interrupt */ |