From 2d6b288d3fe23039325f287b52a851c72e9da76c Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Thu, 2 Aug 2007 00:00:48 +0200 Subject: [PATCH] --- yaml --- r: 63727 b: refs/heads/master c: 313b0305b5a1e7e0fb39383befbf79558ce68a9c h: refs/heads/master i: 63725: 23b71bd14e8c8b0c3e0efdd574dca7fe0378b13b 63723: 9287568b1f948f8ec2378ee1716be8d4f7be629a 63719: e734d6f750fce2097932d3ffb65ec41e04d3d3f0 63711: 2cb0fb7bf067798ea2d436734a99fd3f7155464f v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 73a3b9b907f6..84f44325365a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2584fbc3a61897de5eddd56b39a4fa9cd074eca2 +refs/heads/master: 313b0305b5a1e7e0fb39383befbf79558ce68a9c diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index ec4f545c491f..631e55dbbdd0 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -2767,14 +2767,16 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) rtl8169_check_link_status(dev, tp, ioaddr); #ifdef CONFIG_R8169_NAPI - RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); - tp->intr_mask = ~tp->napi_event; - - if (likely(netif_rx_schedule_prep(dev))) - __netif_rx_schedule(dev); - else if (netif_msg_intr(tp)) { - printk(KERN_INFO "%s: interrupt %04x taken in poll\n", - dev->name, status); + if (status & tp->napi_event) { + RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); + tp->intr_mask = ~tp->napi_event; + + if (likely(netif_rx_schedule_prep(dev))) + __netif_rx_schedule(dev); + else if (netif_msg_intr(tp)) { + printk(KERN_INFO "%s: interrupt %04x in poll\n", + dev->name, status); + } } break; #else