diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 14:29:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:20 (GMT) |
| commit | 1d3d7acedee5f1d2bef3a60eb3358c93a7c207d6 (patch) | |
| tree | e4e4bd014ace34156536b5c8b973c136ba726bb5 /net | |
| parent | 3a6c290337d0bf0d0231eac70a4c92dd0526a98a (diff) | |
| download | linux-fsl-qoriq-1d3d7acedee5f1d2bef3a60eb3358c93a7c207d6.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 f9a892b..41ae38b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3267,11 +3267,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; } |