projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4fd77f
)
can: j1939: cancel rxtimer on multipacket broadcast session complete
author
Zhang Changzhong
<zhangchangzhong@huawei.com>
Wed, 5 Aug 2020 03:50:23 +0000
(11:50 +0800)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Sat, 15 Aug 2020 09:12:57 +0000
(11:12 +0200)
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>
net/can/j1939/transport.c
patch
|
blob
|
history
diff --git
a/net/can/j1939/transport.c
b/net/can/j1939/transport.c
index
868ecb2
..
2f3c3af
100644
(file)
--- 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);