aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-23 12:53:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-11-23 12:53:35 +0000
commit6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414 (patch)
treec2e4c87d971c45a7ea059e4fce4e9e4bb0d357bb /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
parent2bab3e27962b39ef966e0612900fbe185b106241 (diff)
downloadupstream-6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414.tar.gz
upstream-6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414.tar.bz2
upstream-6aeb3528a86fa2b4bf5ad3a34a1c15fb3e369414.zip
ath9k: fix some ar913x irq handling issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43342
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
-rw-r--r--package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index e135970451..34d698ba65 100644
--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -125,9 +125,9 @@
REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -529,6 +529,11 @@ irqreturn_t ath_isr(int irq, void *dev)
- ath9k_debug_sync_cause(sc, sync_cause);
- status &= ah->imask; /* discard unasked-for bits */
+@@ -532,6 +532,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+ if (AR_SREV_9100(ah) && test_bit(ATH_OP_HW_RESET, &common->op_flags))
+ return IRQ_HANDLED;
+ if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
+ status |= ATH9K_INT_FATAL;