OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2012-10-28 15:12:49 +00:00 committed by Alibek Omarov
parent f46faf6ae0
commit dd624a5df8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/dev.c
View File

@ -3311,11 +3311,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;
}