---

yaml --- r: 254967 b: refs/heads/master c: 0d9b6e7 h: refs/heads/master i: 254965: 6fcaf2a 254963: 6c7ae11 254959: ee87203 v: v3
git-mirror · Jul 15, 2011 · de985eb · de985eb
1 parent 35a27a7
commit de985eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62f2a3a48bdc99822a24356e667e52c30df287c9
+refs/heads/master: 0d9b6e738a22244d38def847a24e5ee6fcedd898
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
@@ -677,9 +677,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
 		if (status & RX_FIFO_FULL)
 			dev->stats.rx_fifo_errors++;
 
-		/* Mask off RX interrupt */
-		misr &= ~RX_INTS;
-		napi_schedule(&lp->napi);
+		if (likely(napi_schedule_prep(&lp->napi))) {
+			/* Mask off RX interrupt */
+			misr &= ~RX_INTS;
+			__napi_schedule(&lp->napi);
+		}
 	}
 
 	/* TX interrupt request */