From 4f539280603183f4e86915bc15604165b1e64ae3 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 26 Jun 2009 19:27:04 -0700
Subject: [PATCH] --- yaml --- r: 154501 b: refs/heads/master c:
 ff780cd8f2fa928b193554f593b36d1243554212 h: refs/heads/master i:   154499:
 25d67e43327ff714b7a4fceb52345a1e5a59e9b5 v: v3

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

diff --git a/[refs] b/[refs]
index b0c89109e208..f7923830e5b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71f9dacd2e4d233029e9e956ca3f79531f411827
+refs/heads/master: ff780cd8f2fa928b193554f593b36d1243554212
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 60b572812278..70c27e0c7c32 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2823,9 +2823,11 @@ static void net_rx_action(struct softirq_action *h)
 		 * move the instance around on the list at-will.
 		 */
 		if (unlikely(work == weight)) {
-			if (unlikely(napi_disable_pending(n)))
-				__napi_complete(n);
-			else
+			if (unlikely(napi_disable_pending(n))) {
+				local_irq_enable();
+				napi_complete(n);
+				local_irq_disable();
+			} else
 				list_move_tail(&n->poll_list, list);
 		}