summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSebastian Siewior <bigeasy@linutronix.de>2017-06-16 19:24:00 +0200
committerDavid S. Miller <davem@davemloft.net>2017-06-20 13:09:33 -0400
commitfe420d87bbc234015b4195dd239b7d3052b140ea (patch)
tree67deb0d30ebb3f7149e0556158d2318a5c8170ce /net
parentbdaf32c3ced3d111b692f0af585f880f82d686c5 (diff)
downloadlinux-sh-fe420d87bbc234015b4195dd239b7d3052b140ea.tar.gz
net/core: remove explicit do_softirq() from busy_poll_stop()
Since commit 217f69743681 ("net: busy-poll: allow preemption in sk_busy_loop()") there is an explicit do_softirq() invocation after local_bh_enable() has been invoked. I don't understand why we need this because local_bh_enable() will invoke do_softirq() once the softirq counter reached zero and we have softirq-related work pending. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 6d60149287a1..7243421c9783 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5206,8 +5206,6 @@ static void busy_poll_stop(struct napi_struct *napi, void *have_poll_lock)
if (rc == BUSY_POLL_BUDGET)
__napi_schedule(napi);
local_bh_enable();
- if (local_softirq_pending())
- do_softirq();
}
void napi_busy_loop(unsigned int napi_id,