diff options
| author | Francois Romieu <romieu@electric-eye.fr.zoreil.com> | 2005-11-16 23:44:05 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@electric-eye.fr.zoreil.com> | 2005-11-16 23:44:05 +0100 |
| commit | 7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3 (patch) | |
| tree | 0e2d79d349bf0a2f73d90e3330894f7a8cf27327 /drivers/net/r8169.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3.tar.xz linux-7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3.zip | |
r8169: fix printk_ratelimit in the interrupt handler
I keep on getting "printk: N messages suppressed" messages. We need to test
netif_msg_intr() _before_ running printk_ratelimit(), because the latter
updates state.
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 159b56a56ef4..bda6095f3120 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2516,7 +2516,7 @@ rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs) } while (boguscnt > 0); if (boguscnt <= 0) { - if (net_ratelimit() && netif_msg_intr(tp)) { + if (netif_msg_intr(tp) && net_ratelimit() ) { printk(KERN_WARNING "%s: Too much work at interrupt!\n", dev->name); } |