diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-27 23:18:35 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-27 23:18:35 +0400 |
| commit | 11ad2f52826ac6d58d6780d3d8a3e098c88d9142 (patch) | |
| tree | 92206a4063520aa749f0086f5addb9889f6d6b6f /drivers/net/wireless/ath/ath9k/main.c | |
| parent | c5c177b4aca83338781e72be2e6dd1601c560cb3 (diff) | |
| parent | 1df85ecec36ad5da3f0165760704310d6c03f65f (diff) | |
| download | linux-11ad2f52826ac6d58d6780d3d8a3e098c88d9142.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index a198ee374b05..2ca351fe6d3c 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -670,7 +670,8 @@ void ath9k_tasklet(unsigned long data) u32 status = sc->intrstatus; u32 rxmask; - if (status & ATH9K_INT_FATAL) { + if ((status & ATH9K_INT_FATAL) || + (status & ATH9K_INT_BB_WATCHDOG)) { ath_reset(sc, true); return; } @@ -737,6 +738,7 @@ irqreturn_t ath_isr(int irq, void *dev) { #define SCHED_INTR ( \ ATH9K_INT_FATAL | \ + ATH9K_INT_BB_WATCHDOG | \ ATH9K_INT_RXORN | \ ATH9K_INT_RXEOL | \ ATH9K_INT_RX | \ |