---

yaml --- r: 154501 b: refs/heads/master c: ff780cd h: refs/heads/master i: 154499: 25d67e4 v: v3
git-mirror · Jun 27, 2009 · 4f53928 · 4f53928
1 parent 4a02280
commit 4f53928
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: 71f9dacd2e4d233029e9e956ca3f79531f411827
+refs/heads/master: ff780cd8f2fa928b193554f593b36d1243554212
diff --git 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);
 		}