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-13 11:01:22 -0500
commit0f2c626602bfd26ba7cdde7b30316ff60900af91 (patch)
tree9433609fe340ef88a84b9285b1b45fdeac1d3a40 /net
parent900cace31f593d170a09cf7be41d8c125702b58b (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 c25d453b2803..13b863e589f1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2969,7 +2969,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;