[PATCH v3] tipc: initialise addr_trail_end when setting node addresses

From: Chris Packham
Date: Sun Aug 11 2019 - 16:18:54 EST


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@xxxxxxxxxxxxxxxxxxx>
Acked-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
---

Notes:
Changes in v3:
- Reword commit message as suggested
- Include acl from Jon
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 = addr;
+ tn->addr_trial_end = jiffies;
pr_info("32-bit node address hash set to %x\n", addr);
}

--
2.22.0