Commit 75812433 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails 



The call to can_rx_offload_queue_sorted() may fail and return an error
(in the current implementation due to resource shortage). The passed skb
is consumed.

This patch adds incrementing of the appropriate error counters to let
the device statistics reflect that there's a problem.

Reported-by: default avatarMartin Hundebøll <martin@geanix.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1f7f504d

drivers/net/can/flexcan.c

+8 −2
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr) 
	struct can_frame *cf;

	bool rx_errors = false, tx_errors = false;

	u32 timestamp;

	int err;



	timestamp = priv->read(&regs->timer) << 16;
@@ -725,7 +726,9 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr) 
	if (tx_errors)

		dev->stats.tx_errors++;



	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	if (err)

		dev->stats.rx_fifo_errors++;

}



static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
@@ -738,6 +741,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr) 
	int flt;

	struct can_berr_counter bec;

	u32 timestamp;

	int err;



	timestamp = priv->read(&regs->timer) << 16;
@@ -769,7 +773,9 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr) 
	if (unlikely(new_state == CAN_STATE_BUS_OFF))

		can_bus_off(dev);



	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	if (err)

		dev->stats.rx_fifo_errors++;

}



static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)

CRA Git | Maintained and supported by SUSTech CRA and CCSE