summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index d539056..ebe863c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3267,11 +3267,9 @@ int netif_rx_ni(struct sk_buff *skb)
{
int err;
- migrate_disable();
+ local_bh_disable();
err = netif_rx(skb);
- if (local_softirq_pending())
- thread_do_softirq();
- migrate_enable();
+ local_bh_enable();
return err;
}