can: ems_usb: ems_usb_rx_err(): fix {rx,tx}_errors statistics

[ Upstream commit 72a7e2e74b3075959f05e622bae09b115957dffe ]

The ems_usb_rx_err() function only incremented the receive error counter
and never the transmit error counter, even if the ECC_DIR flag reported
that an error had occurred during transmission.

Increment the receive/transmit error counter based on the value of the
ECC_DIR flag.

Fixes: 702171adeed3 ("ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Link: https://patch.msgid.link/20241122221650.633981-12-dario.binacchi@amarulasolutions.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 0581e70ab903e7921bd707109aac35c61431fc29..af81ccc9572bcb39ad1ddd8e6d5c9c2d2e218506 100644 (file)
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -334,15 +334,14 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
        struct net_device_stats *stats = &dev->netdev->stats;
 
        skb = alloc_can_err_skb(dev->netdev, &cf);
-       if (skb == NULL)
-               return;
 
        if (msg->type == CPC_MSG_TYPE_CAN_STATE) {
                u8 state = msg->msg.can_state;
 
                if (state & SJA1000_SR_BS) {
                        dev->can.state = CAN_STATE_BUS_OFF;
-                       cf->can_id |= CAN_ERR_BUSOFF;
+                       if (skb)
+                               cf->can_id |= CAN_ERR_BUSOFF;
 
                        dev->can.can_stats.bus_off++;
                        can_bus_off(dev->netdev);
@@ -360,44 +359,53 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
 
                /* bus error interrupt */
                dev->can.can_stats.bus_error++;
-               stats->rx_errors++;
 
-               cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+               if (skb) {
+                       cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
-               switch (ecc & SJA1000_ECC_MASK) {
-               case SJA1000_ECC_BIT:
-                       cf->data[2] |= CAN_ERR_PROT_BIT;
-                       break;
-               case SJA1000_ECC_FORM:
-                       cf->data[2] |= CAN_ERR_PROT_FORM;
-                       break;
-               case SJA1000_ECC_STUFF:
-                       cf->data[2] |= CAN_ERR_PROT_STUFF;
-                       break;
-               default:
-                       cf->data[3] = ecc & SJA1000_ECC_SEG;
-                       break;
+                       switch (ecc & SJA1000_ECC_MASK) {
+                       case SJA1000_ECC_BIT:
+                               cf->data[2] |= CAN_ERR_PROT_BIT;
+                               break;
+                       case SJA1000_ECC_FORM:
+                               cf->data[2] |= CAN_ERR_PROT_FORM;
+                               break;
+                       case SJA1000_ECC_STUFF:
+                               cf->data[2] |= CAN_ERR_PROT_STUFF;
+                               break;
+                       default:
+                               cf->data[3] = ecc & SJA1000_ECC_SEG;
+                               break;
+                       }
                }
 
                /* Error occurred during transmission? */
-               if ((ecc & SJA1000_ECC_DIR) == 0)
-                       cf->data[2] |= CAN_ERR_PROT_TX;
+               if ((ecc & SJA1000_ECC_DIR) == 0) {
+                       stats->tx_errors++;
+                       if (skb)
+                               cf->data[2] |= CAN_ERR_PROT_TX;
+               } else {
+                       stats->rx_errors++;
+               }
 
-               if (dev->can.state == CAN_STATE_ERROR_WARNING ||
-                   dev->can.state == CAN_STATE_ERROR_PASSIVE) {
+               if (skb && (dev->can.state == CAN_STATE_ERROR_WARNING ||
+                           dev->can.state == CAN_STATE_ERROR_PASSIVE)) {
                        cf->can_id |= CAN_ERR_CRTL;
                        cf->data[1] = (txerr > rxerr) ?
                            CAN_ERR_CRTL_TX_PASSIVE : CAN_ERR_CRTL_RX_PASSIVE;
                }
        } else if (msg->type == CPC_MSG_TYPE_OVERRUN) {
-               cf->can_id |= CAN_ERR_CRTL;
-               cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+               if (skb) {
+                       cf->can_id |= CAN_ERR_CRTL;
+                       cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+               }
 
                stats->rx_over_errors++;
                stats->rx_errors++;
        }
 
-       netif_rx(skb);
+       if (skb)
+               netif_rx(skb);
 }
 
 /*