diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 16:29:27 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-04-10 16:37:13 -0500 |
commit | 20b8f7d02422720451c5aa768481a545e986cdb3 (patch) | |
tree | 0c80e216ecdc7e43a72d5a0f0d3c3911f5f9d3cc /net | |
parent | c70b1c27e849e9965507786ff9a0f95bf2e32694 (diff) |
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 c28987a669d4..517b488ff9db 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3034,11 +3034,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; } |