diff options
| author | Zhang Changzhong <zhangchangzhong@huawei.com> | 2020-08-05 11:50:23 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-26 10:41:01 +0200 |
| commit | d0dc3d2c71e28a2dcdf7d6bd18a2fe0fc5e64080 (patch) | |
| tree | f099b0ffd45a1a2db11453e4a2a69359b352421b /net/can/j1939/transport.c | |
| parent | 5159a0a5164b3241360777ae733e45a65bf6d288 (diff) | |
| download | linux-stable-d0dc3d2c71e28a2dcdf7d6bd18a2fe0fc5e64080.tar.gz linux-stable-d0dc3d2c71e28a2dcdf7d6bd18a2fe0fc5e64080.tar.bz2 linux-stable-d0dc3d2c71e28a2dcdf7d6bd18a2fe0fc5e64080.zip | |
can: j1939: cancel rxtimer on multipacket broadcast session complete
[ Upstream commit e8b17653088f28a87c81845fa41a2d295a3b458c ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/can/j1939/transport.c')
| -rw-r--r-- | net/can/j1939/transport.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 67189b4c482c..d1a9adde677b 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1811,6 +1811,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); |