summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Packham <chris.packham@alliedtelesis.co.nz>2019-08-11 22:18:25 +0200
committerDavid S. Miller <davem@davemloft.net>2019-08-12 06:40:04 +0200
commit8874ecae2977e5a2d4f0ba301364435b81c05938 (patch)
treef24039257989cea6288c9f8b6922a3a161801884
parentnet: dsa: Check existence of .port_mdb_add callback before calling it (diff)
downloadlinux-8874ecae2977e5a2d4f0ba301364435b81c05938.tar.xz
linux-8874ecae2977e5a2d4f0ba301364435b81c05938.zip
tipc: initialise addr_trail_end when setting node addresses
We set the field 'addr_trial_end' to 'jiffies', instead of the current value 0, at the moment the node address is initialized. This guarantees we don't inadvertently enter an address trial period when the node address is explicitly set by the user. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/addr.c1
1 files changed, 1 insertions, 0 deletions
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 = addr;
+ tn->addr_trial_end = jiffies;
pr_info("32-bit node address hash set to %x\n", addr);
}