can: kvaser_usb_hydra: do not report txerr and rxerr during bus-off
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 19 Jul 2022 14:35:45 +0000 (23:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:33 +0000 (14:23 +0200)
[ Upstream commit 936e90595376e64b6247c72d3ea8b8b164b7ac96 ]

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

Fixes: aec5fb2268b7 ("can: kvaser_usb: Add support for Kvaser USB hydra family")
Link: https://lore.kernel.org/all/20220719143550.3681-8-mailhol.vincent@wanadoo.fr
CC: Jimmy Assarsson <extja@kvaser.com>
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>
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c

index fce3f069cdbc0a08a62861d5cfca3fc606dd7139..93d7ee6d17b6e1bfbd239b834e87e9006073f450 100644 (file)
@@ -916,8 +916,10 @@ static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv,
            new_state < CAN_STATE_BUS_OFF)
                priv->can.can_stats.restarts++;
 
-       cf->data[6] = bec->txerr;
-       cf->data[7] = bec->rxerr;
+       if (new_state != CAN_STATE_BUS_OFF) {
+               cf->data[6] = bec->txerr;
+               cf->data[7] = bec->rxerr;
+       }
 
        stats = &netdev->stats;
        stats->rx_packets++;
@@ -1071,8 +1073,10 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,
        shhwtstamps->hwtstamp = hwtstamp;
 
        cf->can_id |= CAN_ERR_BUSERROR;
-       cf->data[6] = bec.txerr;
-       cf->data[7] = bec.rxerr;
+       if (new_state != CAN_STATE_BUS_OFF) {
+               cf->data[6] = bec.txerr;
+               cf->data[7] = bec.rxerr;
+       }
 
        stats->rx_packets++;
        stats->rx_bytes += cf->len;