Commit 9e662425 authored by Dario Binacchi's avatar Dario Binacchi Committed by Marc Kleine-Budde
Browse files

can: c_can: c_can_handle_bus_err(): update statistics if skb allocation fails 



Ensure that the statistics are always updated, even if the skb
allocation fails.

Fixes: 4d6d2653 ("can: c_can: fix {rx,tx}_errors statistics")
Signed-off-by: default avatarDario Binacchi <dario.binacchi@amarulasolutions.com>
Link: https://patch.msgid.link/20241122221650.633981-2-dario.binacchi@amarulasolutions.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 889b2ae9

drivers/net/can/c_can/c_can_main.c

+17 −9
Original line number Diff line number Diff line
@@ -1014,42 +1014,47 @@ static int c_can_handle_bus_err(struct net_device *dev, 


	/* propagate the error condition to the CAN stack */

	skb = alloc_can_err_skb(dev, &cf);

	if (unlikely(!skb))

		return 0;



	/* check for 'last error code' which tells us the

	 * type of the last error to occur on the CAN bus

	 */

	if (likely(skb))

		cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;



	switch (lec_type) {

	case LEC_STUFF_ERROR:

		netdev_dbg(dev, "stuff error\n");

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_STUFF;

		stats->rx_errors++;

		break;

	case LEC_FORM_ERROR:

		netdev_dbg(dev, "form error\n");

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_FORM;

		stats->rx_errors++;

		break;

	case LEC_ACK_ERROR:

		netdev_dbg(dev, "ack error\n");

		if (likely(skb))

			cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		stats->tx_errors++;

		break;

	case LEC_BIT1_ERROR:

		netdev_dbg(dev, "bit1 error\n");

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_BIT1;

		stats->tx_errors++;

		break;

	case LEC_BIT0_ERROR:

		netdev_dbg(dev, "bit0 error\n");

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_BIT0;

		stats->tx_errors++;

		break;

	case LEC_CRC_ERROR:

		netdev_dbg(dev, "CRC error\n");

		if (likely(skb))

			cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		stats->rx_errors++;

		break;
@@ -1057,6 +1062,9 @@ static int c_can_handle_bus_err(struct net_device *dev, 
		break;

	}



	if (unlikely(!skb))

		return 0;



	netif_receive_skb(skb);

	return 1;

}