summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-10-28 15:12:49 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:21:06 (GMT)
commit74ec05f9505c5e05038d4de5b1d8cc714574ce07 (patch)
tree531fe8c55edc604a6a409cdbed5a91d5697e35e4
parent8b9cc0e9ce1b2ddc42deca0c2187160254c876ea (diff)
downloadlinux-fsl-qoriq-74ec05f9505c5e05038d4de5b1d8cc714574ce07.tar.xz
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>
-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 6031165..0407823 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3281,11 +3281,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;
}