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-11-14 11:01:35 -0600
commit62e4257c04a5e5ecf5b8e861e7348a3d73bdf702 (patch)
treee5376a798fbad6e8076cad85b8664072bec4ae3c /net
parent9292a3dd01b59b0dff470cf5f2f7e5397fec21dc (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 6ba50a1e404c..b0b01dfabcc4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3036,7 +3036,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;