From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AE01C433DF for ; Mon, 24 Aug 2020 08:42:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C95762087D for ; Mon, 24 Aug 2020 08:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258544; bh=NSM0kikoMYd4CitRmeGSudrfPq2pKTmsMTIAOfWWzhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RFD9qnkYDzCy5B+U1KEBc8cWQA6ZEGDCgSMugXMHR1DkWZHlSe/oPwumjnd521Nlm b/F1J28hGW4+mrq+RPG9SM7XMeOgknphyvBKQ3qEbDMbcA1tUkcGkpqWKvHoRkrKgI M9uPPO8Pm3zvk0cFKRfthLUbZBYYJCIpQsm6Ha8Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728938AbgHXImW (ORCPT ); Mon, 24 Aug 2020 04:42:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:33840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728901AbgHXImL (ORCPT ); Mon, 24 Aug 2020 04:42:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 400012074D; Mon, 24 Aug 2020 08:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258530; bh=NSM0kikoMYd4CitRmeGSudrfPq2pKTmsMTIAOfWWzhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uaoM91sP7dlbwYqDenlP/fj1el0dg6DD59+Why2fA+RSfSMar6JhEt8z0LVBnM1mJ iarwgbujLvOq4gLt+3ZCKIGIM06qsaHdawvFiw9bhGWA63X1ZBRhCViFHOAHDTkANR kRMu0lKUFu4wJIpZ+4E9gTba4gSOG+Vs+ZrIxhWU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Changzhong , Oleksij Rempel , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 5.7 079/124] can: j1939: cancel rxtimer on multipacket broadcast session complete Date: Mon, 24 Aug 2020 10:30:13 +0200 Message-Id: <20200824082413.299417973@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082409.368269240@linuxfoundation.org> References: <20200824082409.368269240@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Changzhong [ Upstream commit e8b17653088f28a87c81845fa41a2d295a3b458c ] If j1939_xtp_rx_dat_one() receive last frame of multipacket broadcast message, j1939_session_timers_cancel() should be called to cancel rxtimer. Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong Link: https://lore.kernel.org/r/1596599425-5534-3-git-send-email-zhangchangzhong@huawei.com Acked-by: Oleksij Rempel Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- net/can/j1939/transport.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 67189b4c482c5..d1a9adde677b0 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1811,6 +1811,7 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, } if (final) { + j1939_session_timers_cancel(session); j1939_session_completed(session); } else if (do_cts_eoma) { j1939_tp_set_rxtimeout(session, 1250); -- 2.25.1