summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 16:29:27 +0200
committerClark Williams <williams@redhat.com>2012-04-13 11:01:38 -0500
commit1a1006e17c2531fa9996571dd51cb6ddf8899779 (patch)
treeeb338c68e90253bebc0070c7d51b1749a4f7c26d
parent6d171ed0884281e5ac166eabac774fded8bf66a8 (diff)
net-netif_rx_ni-migrate-disable.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 13b863e589f1..006fdb09aee1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2966,11 +2966,11 @@ int netif_rx_ni(struct sk_buff *skb)
{
int err;
- preempt_disable();
+ migrate_disable();
err = netif_rx(skb);
if (local_softirq_pending())
thread_do_softirq();
- preempt_enable();
+ migrate_enable();
return err;
}