[PATCH v1 25/34] j1939: transport: make sure txtimer is canceled before starting it again

[Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>]

Double starting the timer will brake refcounting.

Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
---
 net/can/j1939/transport.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index 79233f7884cc..d9a8795dd0b5 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1220,6 +1220,7 @@ j1939_xtp_rx_cts(struct j1939_session *session, struct sk_buff *skb)
 		if (j1939_tp_im_transmitter(&session->skcb)) {
 			if (session->pkt.tx_acked)
 				j1939_sk_errqueue(session, J1939_ERRQUEUE_SCHED);
+			j1939_session_txtimer_cancel(session);
 			j1939_tp_schedule_txtimer(session, 0);
 		}
 	} else {
@@ -1660,8 +1661,10 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb)
 		j1939_tp_set_rxtimeout(session, 1250);
 
 		if (cmd != J1939_TP_CMD_BAM &&
-		    j1939_tp_im_receiver(&session->skcb))
+		    j1939_tp_im_receiver(&session->skcb)) {
+			j1939_session_txtimer_cancel(session);
 			j1939_tp_schedule_txtimer(session, 0);
+		}
 
 		j1939_session_put(session);
 		break;
-- 
2.20.1