---

yaml --- r: 134309 b: refs/heads/master c: 0335ef5 h: refs/heads/master i: 134307: 9acec36 v: v3
git-mirror · Feb 6, 2009 · 4f5fd0a · 4f5fd0a
1 parent 56922eb
commit 4f5fd0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79d30a581fc405fc63322622cb1517d95ed8f5ce
+refs/heads/master: 0335ef5d59f40931e1b8f0a8be6a09dbc623081b
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
@@ -3708,13 +3708,13 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data)
 	u32 events;
 
 	events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_RX_ALL;
-	writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus);
 
 	if (events) {
-		napi_schedule(&np->napi);
 		/* disable receive interrupts on the nic */
 		writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask);
 		pci_push(base);
+		writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus);
+		napi_schedule(&np->napi);
 	}
 	return IRQ_HANDLED;
 }