]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: rockchip-canfd: rkcanfd_start_xmit(): use can_dev_dropped_skb() instead of can_d...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 17 Oct 2025 14:28:49 +0000 (16:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:08:54 +0000 (14:08 +0100)
[ Upstream commit 3a3bc9bbb3a0287164a595787df0c70d91e77cfd ]

In addition to can_dropped_invalid_skb(), the helper function
can_dev_dropped_skb() checks whether the device is in listen-only mode and
discards the skb accordingly.

Replace can_dropped_invalid_skb() by can_dev_dropped_skb() to also drop
skbs in for listen-only mode.

Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Closes: https://lore.kernel.org/all/20251017-bizarre-enchanted-quokka-f3c704-mkl@pengutronix.de/
Fixes: ff60bfbaf67f ("can: rockchip_canfd: add driver for Rockchip CAN-FD controller")
Link: https://patch.msgid.link/20251017-fix-skb-drop-check-v1-3-556665793fa4@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/rockchip/rockchip_canfd-tx.c

index 865a15e033a9e50f44af342eec43d4ba10b40fa7..12200dcfd33894658f385584480c603264065f21 100644 (file)
@@ -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,