aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/discover.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/discover.c')
-rw-r--r--net/tipc/discover.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 5b40cb89ff0a..a580a40d0208 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * net/tipc/discover.c 2 * net/tipc/discover.c
3 * 3 *
4 * Copyright (c) 2003-2006, 2014, Ericsson AB 4 * Copyright (c) 2003-2006, 2014-2015, Ericsson AB
5 * Copyright (c) 2005-2006, 2010-2011, Wind River Systems 5 * Copyright (c) 2005-2006, 2010-2011, Wind River Systems
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
@@ -47,7 +47,6 @@
47/* indicates no timer in use */ 47/* indicates no timer in use */
48#define TIPC_LINK_REQ_INACTIVE 0xffffffff 48#define TIPC_LINK_REQ_INACTIVE 0xffffffff
49 49
50
51/** 50/**
52 * struct tipc_link_req - information about an ongoing link setup request 51 * struct tipc_link_req - information about an ongoing link setup request
53 * @bearer_id: identity of bearer issuing requests 52 * @bearer_id: identity of bearer issuing requests
@@ -163,13 +162,9 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *buf,
163 if (!tipc_in_scope(bearer->domain, onode)) 162 if (!tipc_in_scope(bearer->domain, onode))
164 return; 163 return;
165 164
166 /* Locate, or if necessary, create, node: */ 165 node = tipc_node_create(net, onode);
167 node = tipc_node_find(net, onode);
168 if (!node)
169 node = tipc_node_create(net, onode);
170 if (!node) 166 if (!node)
171 return; 167 return;
172
173 tipc_node_lock(node); 168 tipc_node_lock(node);
174 link = node->links[bearer->identity]; 169 link = node->links[bearer->identity];
175 170