diff options
Diffstat (limited to 'net/tipc/server.c')
| -rw-r--r-- | net/tipc/server.c | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/net/tipc/server.c b/net/tipc/server.c index a538a02f869b..eadd4ed45905 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include "server.h" | 36 | #include "server.h" | 
| 37 | #include "core.h" | 37 | #include "core.h" | 
| 38 | #include "socket.h" | ||
| 38 | #include <net/sock.h> | 39 | #include <net/sock.h> | 
| 39 | 40 | ||
| 40 | /* Number of messages to send before rescheduling */ | 41 | /* Number of messages to send before rescheduling */ | 
| @@ -255,7 +256,8 @@ static int tipc_receive_from_sock(struct tipc_conn *con) | |||
| 255 | goto out_close; | 256 | goto out_close; | 
| 256 | } | 257 | } | 
| 257 | 258 | ||
| 258 | s->tipc_conn_recvmsg(con->conid, &addr, con->usr_data, buf, ret); | 259 | s->tipc_conn_recvmsg(sock_net(con->sock->sk), con->conid, &addr, | 
| 260 | con->usr_data, buf, ret); | ||
| 259 | 261 | ||
| 260 | kmem_cache_free(s->rcvbuf_cache, buf); | 262 | kmem_cache_free(s->rcvbuf_cache, buf); | 
| 261 | 263 | ||
| @@ -307,7 +309,7 @@ static struct socket *tipc_create_listen_sock(struct tipc_conn *con) | |||
| 307 | struct socket *sock = NULL; | 309 | struct socket *sock = NULL; | 
| 308 | int ret; | 310 | int ret; | 
| 309 | 311 | ||
| 310 | ret = tipc_sock_create_local(s->type, &sock); | 312 | ret = tipc_sock_create_local(s->net, s->type, &sock); | 
| 311 | if (ret < 0) | 313 | if (ret < 0) | 
| 312 | return NULL; | 314 | return NULL; | 
| 313 | ret = kernel_setsockopt(sock, SOL_TIPC, TIPC_IMPORTANCE, | 315 | ret = kernel_setsockopt(sock, SOL_TIPC, TIPC_IMPORTANCE, | 
