tipc: initialise addr_trail_end when setting node addresses
[ Upstream commit 8874ecae29 ]
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>
This commit is contained in:
parent
e89bb758c0
commit
cc4ff0f4f5
1 changed files with 1 additions and 0 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue