Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1657217pxy; Mon, 2 Aug 2021 07:13:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/2mHA+tAT7Di0dJvy0oYlnTFgAZFh1OLYvM813OBeTVRsKyi0qvjkHOiGqgHBt3PdKMCx X-Received: by 2002:a05:6402:1517:: with SMTP id f23mr19362910edw.83.1627913592503; Mon, 02 Aug 2021 07:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627913592; cv=none; d=google.com; s=arc-20160816; b=Iu4++mD1aZ9sq6vyXwsIAXx6Pnnx2PJicXxBxipq3BeVgRqEFKF9VSDtjNK2SPiGCd +cjP5JGBVJC+Vms3Ln2m/Ehvb5kGAxGXUGQ7FO1DmnVsNLye5fB0gmbZJsqIPPSDd2UQ s4yyAqSzALEPYTyINjYuwdYhUCWZb5c1yFl4WUnq0MtQM7R6koCWlprXH8AnekZtJhQ8 iN0GvPX5eEmJSeLaqdadbEhwRgrt94zPIpKNePzokDcdx7zokmgJg9ATILn/IGd/w7bj A/7T62V6UIDy7jhxNcyeeftREGfpTINGaRxSwD6zj3phbtk5+beZMJa1UVrtTFKIgxQZ 6/aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HjHqrqaAGMQDIVmKatUQCyyaU0WzKoW/KZYQQ878a8w=; b=DGPn0s6BB5V5w3vVxF+g+HNOoDxW7wWtJDQy7HGqFszIsRjZr9hVwrK1ugCMFDMSV3 OQX58ZYT8PdUYwikWMxMnhPkPMzvOfk5Zrk8Lx/d68TspiP/7ZQi5SOGocgUej7JoJAJ n/hK5n1+zPGKxMFGKNMZtU5BF9mbzYx0VilrJyxzD5uwQ2DbA2EhkGd9U/zQ/HFABi64 C3sPoyGw6Tns/vffRgrbo3L0IgSLRqcylgDJNH0Kuu6j8QwGkY17IfjhyggtCbeZF+C6 q7P0OqPfMV1KIoQoDg0rN9QZY5KC4m4OIaO5+wIrbYn9w8svtHyWiWAT+28KUIQyNsR0 SJYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BSzkeN2i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d12si12721582ejj.278.2021.08.02.07.12.46; Mon, 02 Aug 2021 07:13:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BSzkeN2i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234925AbhHBOIQ (ORCPT + 99 others); Mon, 2 Aug 2021 10:08:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:47244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236984AbhHBOAH (ORCPT ); Mon, 2 Aug 2021 10:00:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F5D261183; Mon, 2 Aug 2021 13:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912581; bh=19MS8kvwxsF3b3xQuAZ1NvLXusGWe0aGzbA3foiWk9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSzkeN2iY3piOZeSQs08E4cJyYTNNvtXKPLLcAIZVwkYuVCgd5vP0U9G6BgH7AzrI 0J9LjIDTat+foDwbxjFlOvxWPav7kRtm3K/Wlh+DjDNsvBQ4bwDib0RC5F0sqNSsSt vAtxD/wj0oQ72shKh9/f0KcMpKuWTWtqOch3ugHM= 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 Subject: [PATCH 5.13 014/104] can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms Date: Mon, 2 Aug 2021 15:44:11 +0200 Message-Id: <20210802134344.482677542@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134344.028226640@linuxfoundation.org> References: <20210802134344.028226640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Changzhong commit c6eea1c8bda56737752465a298dc6ce07d6b8ce3 upstream. For receive side, the max time interval between two consecutive TP.DT should be 750ms. Fixes: 9d71dd0c7009 ("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 Signed-off-by: Zhang Changzhong Acked-by: Oleksij Rempel Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- net/can/j1939/transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1869,7 +1869,7 @@ static void j1939_xtp_rx_dat_one(struct if (!session->transmission) j1939_tp_schedule_txtimer(session, 0); } else { - j1939_tp_set_rxtimeout(session, 250); + j1939_tp_set_rxtimeout(session, 750); } session->last_cmd = 0xff; consume_skb(se_skb);