Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp7524653ybh; Thu, 8 Aug 2019 17:56:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqy/t+rQwI8e4FwHU1HXQ6ZaaPkmj4j4Z+98phAIHn6XOSdtF+5JiQqFcqykp782p45ZrlE8 X-Received: by 2002:a62:1d11:: with SMTP id d17mr18644159pfd.249.1565312176748; Thu, 08 Aug 2019 17:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565312176; cv=none; d=google.com; s=arc-20160816; b=FncDh9Dd/5FnjjvyfpIi/XW4L+jZJEvTFqfqlHxEHGlU0UauyPsfM7BYXt/Y6AHjyk BDyxsdCwYzZRTlVDfJiYz7hF9yu17OZal1o6QJufE7+QHlsW1tQ/W5EFMRZXg03RDNKY Pd9ol8v7DX3RCUm0U+zpFglvHabJhtEAUvwnIs6Ye05dQvM2SDWucZQZANKbYu9gSq21 FxAJfxs+2YNJdW9qxfsaKhLL4LruxbQIGLCYzCPHctYEXqlT8E2VrgpMSBvnyQeoPxRm vNx4jp+n0XCnmkipOj/DPX2PRiDwbdRap5r/xpfgFRuoJSFXq5/WnfJdva2iv3Z1Lbhg ShRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=P49ozH2DAvwt8y1J8WbUcyJoXFazE5b714yGTC0YJrQ=; b=ooLCdnocF2hhOZjUWpWP8Gg7dNAW6LnAici/p8OHmmxTOlUZYsp4KPOgnVdDWlClo8 UDCAgO9qCuRvivDVf6AFu5R6Z0G2ELvJWcatKklSKMb0TKU4oW3Hsai991Ce1Ddrnm5C 36mUGr2K3H7nTCu8l4jl0Ub5Acz04BUjIBaIRhc/sGKCmUyNaaYxhG33ZMHJgdGByi7i JJN825abrkYaZVsvAuvT4/Or87bEgXvzCxDUF6/8Ii+/fIk0dfEtAVNxeM6vPgRoJ7c2 rN2e4MKHVdR6i0rCfH6j54onEsKQdajA3SAZKbWNUzLqeNSsg8vSyF7Zso/2dp8nPdmu rz/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=pfmt09bc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u191si52861208pgd.281.2019.08.08.17.56.01; Thu, 08 Aug 2019 17:56:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=pfmt09bc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405149AbfHIAy5 (ORCPT + 99 others); Thu, 8 Aug 2019 20:54:57 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:59148 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405051AbfHIAy5 (ORCPT ); Thu, 8 Aug 2019 20:54:57 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 71110806B6; Fri, 9 Aug 2019 12:54:54 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1565312094; bh=P49ozH2DAvwt8y1J8WbUcyJoXFazE5b714yGTC0YJrQ=; h=From:To:Cc:Subject:Date; b=pfmt09bcvfeV2lGKii2doOv/3SuyBMQLDbrTxaW1TajRJ2c1kBEOF2it4qOMRayek dqN8LPQcQoGmigoD1VeRxJ1nd8/qm7QhOLFTbn08AO6DfTvd7pZPiSjTBxoIAvthbN AmMPbQuX2K+7eyxmmVlNBdFxk7GD0pP4FilsbxCqgDZjXV+m9Nsva1c6KGralqgIGj tGYtPeTkM4fC4uLBJhXu216LbGnjmX4qHmsI8rsJmyOqO1rtNNNF6vogmcPxBP1rYg m+5FoVhsThf3+xdBsoQzc3qeGeawf3OcznvRFjdNeEyPzgP8tia6Ng56t2Lr1cMuJz jlZrTau35L44w== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7,5,8,10121) id ; Fri, 09 Aug 2019 12:54:53 +1200 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id 9DA9013EEDE; Fri, 9 Aug 2019 12:54:56 +1200 (NZST) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 305D71E0508; Fri, 9 Aug 2019 12:54:54 +1200 (NZST) From: Chris Packham To: jon.maloy@ericsson.com, ying.xue@windriver.com, davem@davemloft.net Cc: netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chris Packham Subject: [PATCH v2] tipc: initialise addr_trail_end when setting node addresses Date: Fri, 9 Aug 2019 12:54:51 +1200 Message-Id: <20190809005451.18881-1-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable x-atlnz-ls: pat Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ensure addr_trail_end is set to jiffies when configuring the node address. This ensures that we don't treat the initial value of 0 as being a wrapped. This isn't a problem when using auto-generated node addresses because the addr_trail_end is updated for the duplicate address detection phase. Signed-off-by: Chris Packham --- Changes in v2: - move setting to tipc_set_node_addr() as suggested - reword commit message net/tipc/addr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tipc/addr.c b/net/tipc/addr.c index b88d48d00913..0f1eaed1bd1b 100644 --- a/net/tipc/addr.c +++ b/net/tipc/addr.c @@ -75,6 +75,7 @@ void tipc_set_node_addr(struct net *net, u32 addr) tipc_set_node_id(net, node_id); } tn->trial_addr =3D addr; + tn->addr_trial_end =3D jiffies; pr_info("32-bit node address hash set to %x\n", addr); } =20 --=20 2.22.0