diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 14:29:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:24 (GMT) |
| commit | 7b0dd3249c498b6f67f7d222d5f23a2185ab453a (patch) | |
| tree | b7efec870dd64dee26a72034437564205ad77661 /net | |
| parent | 80304b397d165b9f6f742a719292d607e0d0daa7 (diff) | |
| download | linux-fsl-qoriq-7b0dd3249c498b6f67f7d222d5f23a2185ab453a.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 2edfcf8..fad0a35 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3115,11 +3115,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; } |