---

yaml --- r: 75335 b: refs/heads/master c: fed17f3 h: refs/heads/master i: 75333: 51b27e9 75331: f581818 75327: 759a1ac v: v3
git-mirror · Jan 9, 2008 · 3c10cfc · 3c10cfc
1 parent a6e7212
commit 3c10cfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1d08d1265810ef1f165864850416dcbc9725ee7
+refs/heads/master: fed17f3094b960d3a54b10f17abbe4b57e976eec
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2207,8 +2207,12 @@ static void net_rx_action(struct softirq_action *h)
 		 * still "owns" the NAPI instance and therefore can
 		 * move the instance around on the list at-will.
 		 */
-		if (unlikely(work == weight))
-			list_move_tail(&n->poll_list, list);
+		if (unlikely(work == weight)) {
+			if (unlikely(napi_disable_pending(n)))
+				__napi_complete(n);
+			else
+				list_move_tail(&n->poll_list, list);
+		}
 
 		netpoll_poll_unlock(have);
 	}