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-03-07 16:14:50 -0600
commitfd0f4886ea18514614ed36aee7f2cdb38ae9cacc (patch)
tree4f12311b3f1e0ff1eda096af0f86fa87979208cc /net
parentb473c535681244483693cb66a34bb1ce5e0256f3 (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 c56cacfe2a64..5a56023f0572 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;