diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-10-28 15:12:49 +0000 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-05-08 22:33:29 +0200 |
| commit | 5a45342c64e27f24fe1f537d2df232f0f407bab5 (patch) | |
| tree | 42978d08f7ef24d28ab2b3b89d6b2e8afd7e4687 /net | |
| parent | d66a5716369fe93c732820d257a71ea71c96e6f4 (diff) | |
net: Use local_bh_disable in netif_rx_ni()
This code triggers the new WARN in __raise_softirq_irqsoff() though it
actually looks at the softirq pending bit and calls into the softirq
code, but that fits not well with the context related softirq model of
RT. It's correct on mainline though, but going through
local_bh_disable/enable here is not going to hurt badly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c226fe0d89fd..070d1a9ca643 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3404,11 +3404,9 @@ int netif_rx_ni(struct sk_buff *skb) trace_netif_rx_ni_entry(skb); - migrate_disable(); + local_bh_disable(); err = netif_rx_internal(skb); - if (local_softirq_pending()) - thread_do_softirq(); - migrate_enable(); + local_bh_enable(); return err; } |