From 3c10cfc95b2765c21cf2d8f8d86e7ff39025baae Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 7 Jan 2008 21:00:40 -0800 Subject: [PATCH] --- yaml --- r: 75335 b: refs/heads/master c: fed17f3094b960d3a54b10f17abbe4b57e976eec h: refs/heads/master i: 75333: 51b27e972674be0e33db657ac43288942f48e75a 75331: f58181856b40766ee5416184efc352ebddb675c5 75327: 759a1ace1423c0e62d2cc6072e567e7b5f108d54 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9608b52d27f4..06d49b12f89a 100644 --- 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 index be9d3015beaa..0879f52115eb 100644 --- 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); }