Merge tag 'core-entry-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / net / tipc / bearer.c

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 34ca7b7..e366ec9 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -316,7 +316,6 @@ static int tipc_enable_bearer(struct net *net, const char *name,
        b->domain = disc_domain;
        b->net_plane = bearer_id + 'A';
        b->priority = prio;
-       test_and_set_bit_lock(0, &b->up);
        refcount_set(&b->refcnt, 1);
 
        res = tipc_disc_create(net, b, &b->bcast_addr, &skb);
@@ -326,6 +325,7 @@ static int tipc_enable_bearer(struct net *net, const char *name,
                goto rejected;
        }
 
+       test_and_set_bit_lock(0, &b->up);
        rcu_assign_pointer(tn->bearer_list[bearer_id], b);
        if (skb)
                tipc_bearer_xmit_skb(net, bearer_id, skb, &b->bcast_addr);