summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorZiyang Xuan <william.xuanziyang@huawei.com>2022-09-15 03:55:56 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2022-09-23 13:53:10 +0200
commit3fd7bfd28cfd68ae80a2fe92ea1615722cc2ee6e (patch)
treebb8251b46c8468d34998736640fecb921f855d8b /net/can
parentcan: bcm: registration process optimization in bcm_module_init() (diff)
downloadlinux-3fd7bfd28cfd68ae80a2fe92ea1615722cc2ee6e.tar.xz
linux-3fd7bfd28cfd68ae80a2fe92ea1615722cc2ee6e.zip
can: bcm: check the result of can_send() in bcm_can_tx()
If can_send() fail, it should not update frames_abs counter in bcm_can_tx(). Add the result check for can_send() in bcm_can_tx(). Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de> Suggested-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Link: https://lore.kernel.org/all/9851878e74d6d37aee2f1ee76d68361a46f89458.1663206163.git.william.xuanziyang@huawei.com Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/bcm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 0a2adb844280..27706f6ace34 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -274,6 +274,7 @@ static void bcm_can_tx(struct bcm_op *op)
struct sk_buff *skb;
struct net_device *dev;
struct canfd_frame *cf = op->frames + op->cfsiz * op->currframe;
+ int err;
/* no target device? => exit */
if (!op->ifindex)
@@ -298,11 +299,11 @@ static void bcm_can_tx(struct bcm_op *op)
/* send with loopback */
skb->dev = dev;
can_skb_set_owner(skb, op->sk);
- can_send(skb, 1);
+ err = can_send(skb, 1);
+ if (!err)
+ op->frames_abs++;
- /* update statistics */
op->currframe++;
- op->frames_abs++;
/* reached last frame? */
if (op->currframe >= op->nframes)