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>2012-04-10 16:36:39 -0500
commit5116f787fab6176cc1b549ffedf6280ca2a78a1b (patch)
tree1d4fbdb83483a3a1d9793fef3fdf3436c396c9a0 /net
parent74c020733616a555f2c934d5a3175873a833fdd0 (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 55cd370724c3..c28987a669d4 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;