Commit c621638d authored Jul 06, 2021 by Zhang Changzhong Committed by Greg Kroah-Hartman Aug 04, 2021

can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms

commit c6eea1c8bda56737752465a298dc6ce07d6b8ce3 upstream.

For receive side, the max time interval between two consecutive TP.DT
should be 750ms.

Fixes: 9d71dd0c ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a24d87b4

net/can/j1939/transport.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1869,7 +1869,7 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session,
	if (!session->transmission)		if (!session->transmission)
	j1939_tp_schedule_txtimer(session, 0);		j1939_tp_schedule_txtimer(session, 0);
	} else {		} else {
	j1939_tp_set_rxtimeout(session, 250);		j1939_tp_set_rxtimeout(session, 750);
	}		}
	session->last_cmd = 0xff;		session->last_cmd = 0xff;
	consume_skb(se_skb);		consume_skb(se_skb);