---

yaml --- r: 63727 b: refs/heads/master c: 313b030 h: refs/heads/master i: 63725: 23b71bd 63723: 9287568 63719: e734d6f 63711: 2cb0fb7 v: v3
git-mirror · Aug 6, 2007 · 2d6b288 · 2d6b288
1 parent 3787693
commit 2d6b288
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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