diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 16:29:27 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 09:14:44 -0500 |
| commit | a3ba1fbd9241561c4cdfc301928f5a9d620a58fd (patch) | |
| tree | f77e06f763b2a6b43edf7ec4c7dd581bac2b5b22 /net/core/dev.c | |
| parent | 310cfe2813de2ae95d8c0d4b4637b6b0dfde6637 (diff) | |
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 5a56023f0572..09712a747751 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; } |