]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: esd: acc_start_xmit(): use can_dev_dropped_skb() instead of can_dropped_invalid_...
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 0bee15a5caf36fe513fdeee07fd4f0331e61c064 ]

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: 9721866f07e1 ("can: esd: add support for esd GmbH PCIe/402 CAN interface family")
Link: https://patch.msgid.link/20251017-fix-skb-drop-check-v1-2-556665793fa4@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/esd/esdacc.c

index c80032bc1a5218a18276595d25406c47fea3f225..73e66f9a3781c2bb453af1341073839587d54297 100644 (file)
@@ -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