summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/subscr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 1c147c869c2e..948f316019d7 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -302,11 +302,10 @@ static void subscr_conn_msg_event(struct net *net, int conid,
struct tipc_net *tn = net_generic(net, tipc_net_id);
spin_lock_bh(&subscriber->lock);
- subscr_subscribe(net, (struct tipc_subscr *)buf, subscriber, &sub);
- if (sub)
- tipc_nametbl_subscribe(sub);
- else
+ if (subscr_subscribe(net, (struct tipc_subscr *)buf, subscriber, &sub))
tipc_conn_terminate(tn->topsrv, subscriber->conid);
+ else
+ tipc_nametbl_subscribe(sub);
spin_unlock_bh(&subscriber->lock);
}