]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer
authorZiyang Xuan <william.xuanziyang@huawei.com>
Mon, 6 Sep 2021 09:42:19 +0000 (17:42 +0800)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 17 Oct 2021 10:39:03 +0000 (12:39 +0200)
commitb504a884f6b5a77dac7d580ffa08e482f70d1a30
treec345a16198ba8b02e4e66a9033cf6d2ade30d162
parentfac3cb82a54a4b7c49c932f96ef196cf5774344c
can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer

When the session state is J1939_SESSION_DONE, j1939_tp_rxtimer() will
give an alert "rx timeout, send abort", but do nothing actually. Move
the alert into session active judgment condition, it is more
reasonable.

One of the scenarios is that j1939_tp_rxtimer() execute followed by
j1939_xtp_rx_abort_one(). After j1939_xtp_rx_abort_one(), the session
state is J1939_SESSION_DONE, then j1939_tp_rxtimer() give an alert.

Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
Link: https://lore.kernel.org/all/20210906094219.95924-1-william.xuanziyang@huawei.com
Cc: stable@vger.kernel.org
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/j1939/transport.c