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:40:42 -0500 |
| commit | 0b2705696f41377327d105091244d78e67b4385b (patch) | |
| tree | d1cc872591fbc97e88f65e842b8c63a1fdcf6ad6 /net | |
| parent | 9c0bfa65f825db9eb7e24f899e6ddf242f343ee8 (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 13b863e589f1..006fdb09aee1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2966,11 +2966,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; } |