* [PATCH 1/1] j1939: recover socket queue on CAN bus error during BAM transmission
@ 2024-05-28 7:06 Oleksij Rempel
2024-05-28 13:33 ` [PATCH] " Markus Elfring
0 siblings, 1 reply; 2+ messages in thread
From: Oleksij Rempel @ 2024-05-28 7:06 UTC (permalink / raw)
To: Robin van der Gracht, Oliver Hartkopp, Marc Kleine-Budde
Cc: Oleksij Rempel, stable, Alexander Hölzl, kernel, linux-can,
linux-kernel
Addresses an issue where a CAN bus error during a BAM transmission could
stall the socket queue, preventing further transmissions even after the
bus error is resolved. The fix activates the next queued session after
the error recovery, allowing communication to continue.
Fixes: 9d71dd0c70099 ("can: add support of SAE J1939 protocol")
Cc: stable@vger.kernel.org
Reported-by: Alexander Hölzl <alexander.hoelzl@gmx.net>
Tested-by: Alexander Hölzl <alexander.hoelzl@gmx.net>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
net/can/j1939/transport.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index fe3df23a25957..9805124d16763 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1681,6 +1681,8 @@ static int j1939_xtp_rx_rts_session_active(struct j1939_session *session,
j1939_session_timers_cancel(session);
j1939_session_cancel(session, J1939_XTP_ABORT_BUSY);
+ if (session->transmission)
+ j1939_session_deactivate_activate_next(session);
return -EBUSY;
}
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] j1939: recover socket queue on CAN bus error during BAM transmission
2024-05-28 7:06 [PATCH 1/1] j1939: recover socket queue on CAN bus error during BAM transmission Oleksij Rempel
@ 2024-05-28 13:33 ` Markus Elfring
0 siblings, 0 replies; 2+ messages in thread
From: Markus Elfring @ 2024-05-28 13:33 UTC (permalink / raw)
To: Oleksij Rempel, linux-can, Marc Kleine-Budde, Oliver Hartkopp,
Robin van der Gracht
Cc: LKML, stable, kernel, Alexander Hölzl
> … The fix activates the next queued session after
…
Please choose an imperative change description.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc1#n94
Regards,
Markus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-28 13:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-28 7:06 [PATCH 1/1] j1939: recover socket queue on CAN bus error during BAM transmission Oleksij Rempel
2024-05-28 13:33 ` [PATCH] " Markus Elfring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®