Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94369cd authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Greg Kroah-Hartman
Browse files

can: sja1000: do not report txerr and rxerr during bus-off 

[ Upstream commit 164d7cb2d5a30f1b3a5ab4fab1a27731fb1494a8 ]

During bus off, the error count is greater than 255 and can not fit in
a u8.

Fixes: 215db185 ("can: sja1000: Consolidate and unify state change handling")
Link: https://lore.kernel.org/all/20220719143550.3681-4-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b9d4919

drivers/net/can/sja1000/sja1000.c

+4 −3
Original line number Diff line number Diff line
@@ -405,9 +405,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) 
	txerr = priv->read_reg(priv, SJA1000_TXERR);

	rxerr = priv->read_reg(priv, SJA1000_RXERR);



	cf->data[6] = txerr;

	cf->data[7] = rxerr;



	if (isrc & IRQ_DOI) {

		/* data overrun interrupt */

		netdev_dbg(dev, "data overrun interrupt\n");
@@ -429,6 +426,10 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) 
		else

			state = CAN_STATE_ERROR_ACTIVE;

	}

	if (state != CAN_STATE_BUS_OFF) {

		cf->data[6] = txerr;

		cf->data[7] = rxerr;

	}

	if (isrc & IRQ_BEI) {

		/* bus error interrupt */

		priv->can.can_stats.bus_error++;