summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 14:29:27 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:39 (GMT)
commit1c9e58fad223741faa7dd6ceaaaf0b711ce07f96 (patch)
treea75b78cc452601a94b9de85d48080627eacdc199 /net
parentfffa84ab7c0c17868642c4e888f2be6fb11d3726 (diff)
downloadlinux-fsl-qoriq-1c9e58fad223741faa7dd6ceaaaf0b711ce07f96.tar.xz
net-netif_rx_ni-migrate-disable.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net')
-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 a0c8f06..139aed2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3281,11 +3281,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;
}