projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d7a34d
)
net-netif_rx_ni-migrate-disable.patch
author
Thomas Gleixner
<tglx@linutronix.de>
Sun, 17 Jul 2011 14:29:27 +0000
(16:29 +0200)
committer
Clark Williams
<williams@redhat.com>
Wed, 15 Feb 2012 16:32:51 +0000
(10:32 -0600)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
net/core/dev.c
patch
|
blob
|
history
diff --git
a/net/core/dev.c
b/net/core/dev.c
index 6fd5d228cc1232b4b57c271a05646eec42d101ee..1ecffbbc4137a01e2e0ec3a62134f1fcf6ac2c0f 100644
(file)
--- 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;
}