Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc4ff0f4 authored by Chris Packham's avatar Chris Packham Committed by Greg Kroah-Hartman
Browse files

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: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e89bb758

net/tipc/addr.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}