diff options
author | Ben Greear <greearb@candelatech.com> | 2010-12-06 16:13:07 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 16:54:24 -0500 |
commit | d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b (patch) | |
tree | 9605e6c7784169d82f6b9e28bb38036fa4f02ec0 /drivers/net/wireless | |
parent | 1435894dcd263fdbdd5e1ea2a684289dff187c34 (diff) |
ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE.
This decreases spammage in the log. A single line message
will still be printed, so users can be aware that problem
exists.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index dd78ad13ea0..272dfef2545 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h | |||
@@ -267,6 +267,7 @@ enum ATH_DEBUG { | |||
267 | rtn; \ | 267 | rtn; \ |
268 | }) | 268 | }) |
269 | #define ATH_DBG_WARN(foo, arg...) WARN(foo, arg) | 269 | #define ATH_DBG_WARN(foo, arg...) WARN(foo, arg) |
270 | #define ATH_DBG_WARN_ON_ONCE(foo) WARN_ON_ONCE(foo) | ||
270 | 271 | ||
271 | #else | 272 | #else |
272 | 273 | ||
@@ -277,6 +278,7 @@ ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask, | |||
277 | return 0; | 278 | return 0; |
278 | } | 279 | } |
279 | #define ATH_DBG_WARN(foo, arg...) do {} while (0) | 280 | #define ATH_DBG_WARN(foo, arg...) do {} while (0) |
281 | #define ATH_DBG_WARN_ON_ONCE(foo) do {} while (0) | ||
280 | 282 | ||
281 | #endif /* CONFIG_ATH_DEBUG */ | 283 | #endif /* CONFIG_ATH_DEBUG */ |
282 | 284 | ||
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 70f3fa69c9a..3f8b2e32f36 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -528,8 +528,12 @@ bool ath_stoprecv(struct ath_softc *sc) | |||
528 | sc->rx.rxlink = NULL; | 528 | sc->rx.rxlink = NULL; |
529 | spin_unlock_bh(&sc->rx.rxbuflock); | 529 | spin_unlock_bh(&sc->rx.rxbuflock); |
530 | 530 | ||
531 | ATH_DBG_WARN(!stopped, "Could not stop RX, we could be " | 531 | if (unlikely(!stopped)) { |
532 | "confusing the DMA engine when we start RX up\n"); | 532 | ath_err(ath9k_hw_common(sc->sc_ah), |
533 | "Could not stop RX, we could be " | ||
534 | "confusing the DMA engine when we start RX up\n"); | ||
535 | ATH_DBG_WARN_ON_ONCE(!stopped); | ||
536 | } | ||
533 | return stopped; | 537 | return stopped; |
534 | } | 538 | } |
535 | 539 | ||