tipc: name tipc name table support net namespace

[deliverable/linux.git] / net / tipc / server.c

diff --git a/net/tipc/server.c b/net/tipc/server.c
index 646a930eefbf8fa9a86cfe7011848143aafa49b8..b5bdaf721d70a397a9b4183d144287fa22973982 100644 (file)
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -35,6 +35,7 @@
 
 #include "server.h"
 #include "core.h"
+#include "socket.h"
 #include <net/sock.h>
 
 /* Number of messages to send before rescheduling */
@@ -119,7 +120,7 @@ static struct tipc_conn *tipc_conn_lookup(struct tipc_server *s, int conid)
        return con;
 }
 
-static void sock_data_ready(struct sock *sk, int unused)
+static void sock_data_ready(struct sock *sk)
 {
        struct tipc_conn *con;
 
@@ -255,7 +256,8 @@ static int tipc_receive_from_sock(struct tipc_conn *con)
                goto out_close;
        }
 
-       s->tipc_conn_recvmsg(con->conid, &addr, con->usr_data, buf, ret);
+       s->tipc_conn_recvmsg(sock_net(con->sock->sk), con->conid, &addr,
+                            con->usr_data, buf, ret);
 
        kmem_cache_free(s->rcvbuf_cache, buf);
 
@@ -297,7 +299,7 @@ static int tipc_accept_from_sock(struct tipc_conn *con)
        newcon->usr_data = s->tipc_conn_new(newcon->conid);
 
        /* Wake up receive process in case of 'SYN+' message */
-       newsock->sk->sk_data_ready(newsock->sk, 0);
+       newsock->sk->sk_data_ready(newsock->sk);
        return ret;
 }