diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 14:29:27 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:19:19 (GMT) |
commit | 086eb6f6bfee117803e858278dec495424bcefc1 (patch) | |
tree | c3b2eab40e68ee60455a73bc78dfbff8f5e8aba5 /net/core/dev.c | |
parent | ccd49065c0b73289fcc726c9e27fd22d7e02c4b5 (diff) | |
download | linux-fsl-qoriq-086eb6f6bfee117803e858278dec495424bcefc1.tar.xz |
net-netif_rx_ni-migrate-disable.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index f9a892b..41ae38b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3267,11 +3267,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; } |