diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 14:29:27 (GMT) |
|---|---|---|
| committer | Emil Medve <Emilian.Medve@Freescale.com> | 2013-04-30 08:17:13 (GMT) |
| commit | 0e694b9537749141d43a390bf32630e36a861b3c (patch) | |
| tree | 6d1bc96c6cc5067449687e8557902ff2a4e4097f /net | |
| parent | 6810eb7aad751a8f34bf31e37a3e11bb1613fbcf (diff) | |
| download | linux-fsl-qoriq-0e694b9537749141d43a390bf32630e36a861b3c.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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index f6bc659..b741130 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3114,11 +3114,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; } |