summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-06-28 15:44:15 +0200
committerClark Williams <williams@redhat.com>2011-12-28 16:25:24 -0600
commitbefbd18b45006351d5f5e7e4680e80a934641838 (patch)
treecc379d2c423177d6813296d38051fc23e5b503e3 /net
parent6e647172805c1f1e6d88aae2afab4d01100d5346 (diff)
softirq-thread-do-softirq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 5a13edfc9f73..6fd5d228cc12 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3037,7 +3037,7 @@ int netif_rx_ni(struct sk_buff *skb)
preempt_disable();
err = netif_rx(skb);
if (local_softirq_pending())
- do_softirq();
+ thread_do_softirq();
preempt_enable();
return err;