aboutsummaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorZhang Changzhong <zhangchangzhong@huawei.com>2021-07-06 19:00:08 +0800
committerMarc Kleine-Budde <mkl@pengutronix.de>2021-07-24 19:02:24 +0200
commitc6eea1c8bda56737752465a298dc6ce07d6b8ce3 (patch)
tree67a952e8313cef0afde77b13d2af43986b0d3bca /net/can
parentcan: j1939: j1939_session_deactivate(): clarify lifetime of session object (diff)
downloadlinux-dev-c6eea1c8bda56737752465a298dc6ce07d6b8ce3.tar.xz
linux-dev-c6eea1c8bda56737752465a298dc6ce07d6b8ce3.zip
can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms
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>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/j1939/transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index bb1092c3e7e3..bdc95bd7a851 100644
--- 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, 250);
+ j1939_tp_set_rxtimeout(session, 750);
}
session->last_cmd = 0xff;
consume_skb(se_skb);