diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 16:29:27 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-11-14 11:01:57 -0600 |
| commit | df381ecb77d38860f3db583850f4ae44ff59fdca (patch) | |
| tree | 0dbf163be39ff7f569af241cd5682ca25839aa6b /net | |
| parent | 3280440e08c991c12adf047ec987b983cce2dff1 (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 b0b01dfabcc4..078021a8edeb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3033,11 +3033,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; } |