aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 02:27:11 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:33 -0500
commita62fbccecd62bacb4416fc427239f5b43b25d05e (patch)
tree7f2646f08ce92d8d82cf4a6cbd2126e7f71555ec /net/tipc/socket.c
parent347475395434abb2b61bf59c2952470f37072567 (diff)
tipc: make subscriber server support net namespace
TIPC establishes one subscriber server which allows users to subscribe their interesting name service status. After tipc supports namespace, one dedicated tipc stack instance is created for each namespace, and each instance can be deemed as one independent TIPC node. As a result, subscriber server must be built for each namespace. Signed-off-by: Ying Xue <ying.xue@windriver.com> Tested-by: Tero Aho <Tero.Aho@coriant.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 9b8470edc783..2cec496ba691 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -388,7 +388,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
388 * 388 *
389 * Returns 0 on success, errno otherwise 389 * Returns 0 on success, errno otherwise
390 */ 390 */
391int tipc_sock_create_local(int type, struct socket **res) 391int tipc_sock_create_local(struct net *net, int type, struct socket **res)
392{ 392{
393 int rc; 393 int rc;
394 394
@@ -397,7 +397,7 @@ int tipc_sock_create_local(int type, struct socket **res)
397 pr_err("Failed to create kernel socket\n"); 397 pr_err("Failed to create kernel socket\n");
398 return rc; 398 return rc;
399 } 399 }
400 tipc_sk_create(&init_net, *res, 0, 1); 400 tipc_sk_create(net, *res, 0, 1);
401 401
402 return 0; 402 return 0;
403} 403}