mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 05:55:44 +02:00
can: pch_can: do not report txerr and rxerr during bus-off
[ Upstream commit3a5c7e4611] During bus off, the error count is greater than 255 and can not fit in a u8. Fixes:0c78ab76a0("pch_can: Add setting TEC/REC statistics processing") Link: https://lore.kernel.org/all/20220719143550.3681-2-mailhol.vincent@wanadoo.fr Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d2b9e664bb
commit
5d85a89875
|
|
@ -496,6 +496,9 @@ static void pch_can_error(struct net_device *ndev, u32 status)
|
||||||
cf->can_id |= CAN_ERR_BUSOFF;
|
cf->can_id |= CAN_ERR_BUSOFF;
|
||||||
priv->can.can_stats.bus_off++;
|
priv->can.can_stats.bus_off++;
|
||||||
can_bus_off(ndev);
|
can_bus_off(ndev);
|
||||||
|
} else {
|
||||||
|
cf->data[6] = errc & PCH_TEC;
|
||||||
|
cf->data[7] = (errc & PCH_REC) >> 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
errc = ioread32(&priv->regs->errc);
|
errc = ioread32(&priv->regs->errc);
|
||||||
|
|
@ -556,9 +559,6 @@ static void pch_can_error(struct net_device *ndev, u32 status)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
cf->data[6] = errc & PCH_TEC;
|
|
||||||
cf->data[7] = (errc & PCH_REC) >> 8;
|
|
||||||
|
|
||||||
priv->can.state = state;
|
priv->can.state = state;
|
||||||
netif_receive_skb(skb);
|
netif_receive_skb(skb);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user