summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeroen Hofstee <jhofstee@victronenergy.com>2020-11-27 10:59:38 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2020-11-30 12:43:54 +0100
commitbd0ccb92efb09c7da5b55162b283b42a93539ed7 (patch)
treeefa3b7e87794fb19de93539f69b20f12bef96d8a /drivers/net
parentad1f5e826d91d6c27ecd36a607ad7c7f4d0b0733 (diff)
downloadlinux-stable-bd0ccb92efb09c7da5b55162b283b42a93539ed7.tar.gz
linux-stable-bd0ccb92efb09c7da5b55162b283b42a93539ed7.tar.bz2
linux-stable-bd0ccb92efb09c7da5b55162b283b42a93539ed7.zip
can: sja1000: sja1000_err(): don't count arbitration lose as an error
Losing arbitration is normal in a CAN-bus network, it means that a higher priority frame is being send and the pending message will be retried later. Hence most driver only increment arbitration_lost, but the sja1000 driver also incremeants tx_error, causing errors to be reported on a normal functioning CAN-bus. So stop counting them as errors. Fixes: 8935f57e68c4 ("can: sja1000: fix network statistics update") Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> Link: https://lore.kernel.org/r/20201127095941.21609-1-jhofstee@victronenergy.com [mkl: split into two seperate patches] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/sja1000/sja1000.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 9f107798f904..25a4d7d0b349 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -474,7 +474,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
netdev_dbg(dev, "arbitration lost interrupt\n");
alc = priv->read_reg(priv, SJA1000_ALC);
priv->can.can_stats.arbitration_lost++;
- stats->tx_errors++;
cf->can_id |= CAN_ERR_LOSTARB;
cf->data[0] = alc & 0x1f;
}