Commit 942b3c61 authored Oct 20, 2025 by Marc Kleine-Budde

Merge patch series "can: drivers: drop skb in xmit if device is in listen only mode"

Marc Kleine-Budde <mkl@pengutronix.de> says:

I notived that 3 drivers (bxcan, esd and rockchip) use the function
can_dropped_invalid_skb(), that doesn't check if the device is in listen
only mode. This series converts these driver to use the new
can_dev_dropped_skb() function.

Link: https://patch.msgid.link/20251017-fix-skb-drop-check-v1-0-556665793fa4@pengutronix.de


Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

parents ffff5c8f 3a3bc9bb

drivers/net/can/bxcan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -842,7 +842,7 @@ static netdev_tx_t bxcan_start_xmit(struct sk_buff *skb,
		u32 id;
		int i, j;

		if (can_dropped_invalid_skb(ndev, skb))
		if (can_dev_dropped_skb(ndev, skb))
		return NETDEV_TX_OK;

		if (bxcan_tx_busy(priv))

drivers/net/can/esd/esdacc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ netdev_tx_t acc_start_xmit(struct sk_buff skb, struct net_device netdev)
		u32 acc_id;
		u32 acc_dlc;

		if (can_dropped_invalid_skb(netdev, skb))
		if (can_dev_dropped_skb(netdev, skb))
		return NETDEV_TX_OK;

		/* Access core->tx_fifo_tail only once because it may be changed

drivers/net/can/rockchip/rockchip_canfd-tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ netdev_tx_t rkcanfd_start_xmit(struct sk_buff skb, struct net_device ndev)
		int err;
		u8 i;

		if (can_dropped_invalid_skb(ndev, skb))
		if (can_dev_dropped_skb(ndev, skb))
		return NETDEV_TX_OK;

		if (!netif_subqueue_maybe_stop(priv->ndev, 0,