OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c71437
)
can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to...
author
Zhang Changzhong
<zhangchangzhong@huawei.com>
Tue, 6 Jul 2021 11:00:08 +0000
(19:00 +0800)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Sat, 24 Jul 2021 17:02:24 +0000
(19:02 +0200)
For receive side, the max time interval between two consecutive TP.DT
should be 750ms.
Fixes:
9d71dd0c7009
("can: add support of SAE J1939 protocol")
Link:
https://lore.kernel.org/r/1625569210-47506-1-git-send-email-zhangchangzhong@huawei.com
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Zhang Changzhong <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
bb1092c
..
bdc95bd
100644
(file)
--- a/
net/can/j1939/transport.c
+++ b/
net/can/j1939/transport.c
@@
-1874,7
+1874,7
@@
static void j1939_xtp_rx_dat_one(struct j1939_session *session,
if (!session->transmission)
j1939_tp_schedule_txtimer(session, 0);
} else {
- j1939_tp_set_rxtimeout(session,
2
50);
+ j1939_tp_set_rxtimeout(session,
7
50);
}
session->last_cmd = 0xff;
consume_skb(se_skb);