diff options
| author | Chris Packham <chris.packham@alliedtelesis.co.nz> | 2019-08-12 08:18:25 +1200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 10:48:05 +0200 |
| commit | cc4ff0f4f564a4e88bb88507b6b333eced41b4bb (patch) | |
| tree | f2cec8229e020f321f6ec51cba6fd1b236321a58 | |
| parent | e89bb758c030150f6cf0a990011f109258b815dd (diff) | |
| download | linux-stable-cc4ff0f4f564a4e88bb88507b6b333eced41b4bb.tar.gz linux-stable-cc4ff0f4f564a4e88bb88507b6b333eced41b4bb.tar.bz2 linux-stable-cc4ff0f4f564a4e88bb88507b6b333eced41b4bb.zip | |
tipc: initialise addr_trail_end when setting node addresses
[ Upstream commit 8874ecae2977e5a2d4f0ba301364435b81c05938 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/tipc/addr.c | 1 |
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); } |