[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190807045543.28373-1-chris.packham@alliedtelesis.co.nz>
Date: Wed, 7 Aug 2019 16:55:43 +1200
From: Chris Packham <chris.packham@...iedtelesis.co.nz>
To: jon.maloy@...csson.com, ying.xue@...driver.com, davem@...emloft.net
Cc: netdev@...r.kernel.org, tipc-discussion@...ts.sourceforge.net,
linux-kernel@...r.kernel.org,
Chris Packham <chris.packham@...iedtelesis.co.nz>
Subject: [PATCH] tipc: set addr_trail_end when using explicit node addresses
When tipc uses auto-generated node addresses it goes through a duplicate
address detection phase to ensure the address is unique.
When using explicitly configured node names the DAD phase is skipped.
However addr_trail_end was being left set to 0 which causes parts of the
tipc state machine to assume that the address is not yet valid and
unnecessarily delays the discovery phase. By setting addr_trail_end to
jiffies when using explicit addresses we ensure that we move straight to
discovery.
Signed-off-by: Chris Packham <chris.packham@...iedtelesis.co.nz>
---
net/tipc/discover.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index c138d68e8a69..f83bfe8c9443 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -361,6 +361,8 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b,
if (!tipc_own_addr(net)) {
tn->addr_trial_end = jiffies + msecs_to_jiffies(1000);
msg_set_type(buf_msg(d->skb), DSC_TRIAL_MSG);
+ } else {
+ tn->addr_trial_end = jiffies;
}
memcpy(&d->dest, dest, sizeof(*dest));
d->net = net;
--
2.22.0
Powered by blists - more mailing lists