Commit 2344ef3c authored Dec 30, 2016 by Sergei Shtylyov Committed by David S. Miller Dec 29, 2016

sh_eth: fix branch prediction in sh_eth_interrupt()

IIUC, likely()/unlikely() should apply to the whole *if* statement's
expression, not a part of it -- fix such expression in sh_eth_interrupt()
accordingly...

Fixes: 283e38db ("sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e400b797

drivers/net/ethernet/renesas/sh_eth.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1656,7 +1656,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
	else		else
	goto out;		goto out;

	if (!likely(mdp->irq_enabled)) {		if (unlikely(!mdp->irq_enabled)) {
	sh_eth_write(ndev, 0, EESIPR);		sh_eth_write(ndev, 0, EESIPR);
	goto out;		goto out;
	}		}

Admin message