diff options
| author | Vincent Mailhol <mailhol.vincent@wanadoo.fr> | 2022-07-19 17:35:42 +0300 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2022-07-20 10:26:49 +0300 |
| commit | ce0e7aeb676b40e765ec5b88d690fa9fa252c373 (patch) | |
| tree | 97bed6636312422726eeda3026de13f5f26e8a6a /drivers | |
| parent | 164d7cb2d5a30f1b3a5ab4fab1a27731fb1494a8 (diff) | |
| download | linux-ce0e7aeb676b40e765ec5b88d690fa9fa252c373.tar.xz | |
can: slcan: do not report txerr and rxerr during bus-off
During bus off, the error count is greater than 255 and can not fit in
a u8.
alloc_can_err_skb() already sets cf to NULL if the allocation fails [1],
so the redundant cf = NULL assignment gets removed.
[1] https://elixir.bootlin.com/linux/latest/source/drivers/net/can/dev/skb.c#L187
Fixes: 0a9cdcf098a4 ("can: slcan: extend the protocol with CAN state info")
Link: https://lore.kernel.org/all/20220719143550.3681-5-mailhol.vincent@wanadoo.fr
CC: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/slcan/slcan-core.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c index 057b211f3e7f..dfd1baba4130 100644 --- a/drivers/net/can/slcan/slcan-core.c +++ b/drivers/net/can/slcan/slcan-core.c @@ -306,19 +306,17 @@ static void slc_bump_state(struct slcan *sl) return; skb = alloc_can_err_skb(dev, &cf); - if (skb) { - cf->data[6] = txerr; - cf->data[7] = rxerr; - } else { - cf = NULL; - } tx_state = txerr >= rxerr ? state : 0; rx_state = txerr <= rxerr ? state : 0; can_change_state(dev, cf, tx_state, rx_state); - if (state == CAN_STATE_BUS_OFF) + if (state == CAN_STATE_BUS_OFF) { can_bus_off(dev); + } else if (skb) { + cf->data[6] = txerr; + cf->data[7] = rxerr; + } if (skb) netif_rx(skb); |