diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 16:29:27 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:42 -0600 |
| commit | bfa02feb9a9bfe38df60a581ca9bcecd94d274a6 (patch) | |
| tree | f3e1f9072577ae21f253beba9e1a3bddd01df84e /net | |
| parent | 2fb160344f20143b59ccc6c00058ed6098011319 (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 6fd5d228cc12..1ecffbbc4137 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; } |