summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorZhang Changzhong <zhangchangzhong@huawei.com>2020-08-05 11:50:23 +0800
committerMarc Kleine-Budde <mkl@pengutronix.de>2020-08-15 11:12:57 +0200
commite8b17653088f28a87c81845fa41a2d295a3b458c (patch)
tree6a610867706b26e3f1fc751ec9c83b8e5d1c0915 /net/can
parentf4fd77fd87e9b214c26bb2ebd4f90055eaea5ade (diff)
downloadlinux-e8b17653088f28a87c81845fa41a2d295a3b458c.tar.bz2
can: j1939: cancel rxtimer on multipacket broadcast session complete
If j1939_xtp_rx_dat_one() receive last frame of multipacket broadcast message, j1939_session_timers_cancel() should be called to cancel rxtimer. Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Link: https://lore.kernel.org/r/1596599425-5534-3-git-send-email-zhangchangzhong@huawei.com Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/j1939/transport.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index 868ecb2bfa45..2f3c3afd5071 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1824,6 +1824,7 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session,
}
if (final) {
+ j1939_session_timers_cancel(session);
j1939_session_completed(session);
} else if (do_cts_eoma) {
j1939_tp_set_rxtimeout(session, 1250);