Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/net/tipc/net.c b/net/tipc/net.c
index a7f6964c3a4b..62199cf5a56c 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -123,15 +123,13 @@ void tipc_net_finalize(struct net *net, u32 addr)
 {
         struct tipc_net *tn = tipc_net(net);
 
-        spin_lock_bh(&tn->node_list_lock);
-        if (!tipc_own_addr(net)) {
+        if (!cmpxchg(&tn->node_addr, 0, addr)) {
                 tipc_set_node_addr(net, addr);
                 tipc_named_reinit(net);
                 tipc_sk_reinit(net);
                 tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr,
                                      TIPC_CLUSTER_SCOPE, 0, addr);
         }
-        spin_unlock_bh(&tn->node_list_lock);
 }
 
 void tipc_net_stop(struct net *net)