Zhang Changzhong 2b8b2e3155 can: j1939: abort multipacket broadcast session when timeout occurs ... If timeout occurs, j1939_tp_rxtimer() first calls hrtimer_start() to restart rxtimer, and then calls __j1939_session_cancel() to set session->state = J1939_SESSION_WAITING_ABORT. At next timeout expiration, because of the J1939_SESSION_WAITING_ABORT session state j1939_tp_rxtimer() will call j1939_session_deactivate_activate_next() to deactivate current session, and rxtimer won't be set. But for multipacket broadcast session, __j1939_session_cancel() don't set session->state = J1939_SESSION_WAITING_ABORT, thus current session won't be deactivate and hrtimer_start() is called to start new rxtimer again and again. So fix it by moving session->state = J1939_SESSION_WAITING_ABORT out of if (!j1939_cb_is_broadcast(&session->skcb)) statement. Fixes: 9d71dd0c70 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Link: https://lore.kernel.org/r/1596599425-5534-4-git-send-email-zhangchangzhong@huawei.com Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>		2020-08-15 11:12:58 +02:00
..
j1939	can: j1939: abort multipacket broadcast session when timeout occurs	2020-08-15 11:12:58 +02:00
af_can.c	net: can: kerneldoc fixes	2020-07-13 17:20:39 -07:00
af_can.h	can: introduce CAN midlayer private and allocate it automatically	2019-09-04 13:29:14 +02:00
bcm.c	net: make ->{get,set}sockopt in proto_ops optional	2020-07-19 18:16:41 -07:00
gw.c	can: gw: add support for CAN FD frames	2019-08-13 17:32:21 +02:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	can: add support of SAE J1939 protocol	2019-09-04 14:22:33 +02:00
proc.c	can: introduce CAN midlayer private and allocate it automatically	2019-09-04 13:29:14 +02:00
raw.c	net: pass a sockptr_t into ->setsockopt	2020-07-24 15:41:54 -07:00