From de985ebe65939084834889d1216995005b51a4bc Mon Sep 17 00:00:00 2001
From: Michael Thalmeier <Michael.Thalmeier@sigmatek.at>
Date: Fri, 15 Jul 2011 01:28:26 +0000
Subject: [PATCH] --- yaml --- r: 254967 b: refs/heads/master c:
 0d9b6e738a22244d38def847a24e5ee6fcedd898 h: refs/heads/master i:   254965:
 6fcaf2a6f29afdd4f5bf5c39a033f06c7dd76241   254963:
 6c7ae11bf73fbdfd0bbe953f76c3a576f66bd86a   254959:
 ee872030b49065ca367d6d8415c3d3541838aa81 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 86c0dd8fecec..595b9af0f499 100644
--- 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
index 200a363c3bf5..0ffec4608441 100644
--- 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 */