diff options
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 30586ab9e878..266b6972667d 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -282,12 +282,12 @@ static struct proto rfcomm_proto = { | |||
282 | .obj_size = sizeof(struct rfcomm_pinfo) | 282 | .obj_size = sizeof(struct rfcomm_pinfo) |
283 | }; | 283 | }; |
284 | 284 | ||
285 | static struct sock *rfcomm_sock_alloc(struct socket *sock, int proto, gfp_t prio) | 285 | static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio) |
286 | { | 286 | { |
287 | struct rfcomm_dlc *d; | 287 | struct rfcomm_dlc *d; |
288 | struct sock *sk; | 288 | struct sock *sk; |
289 | 289 | ||
290 | sk = sk_alloc(PF_BLUETOOTH, prio, &rfcomm_proto, 1); | 290 | sk = sk_alloc(net, PF_BLUETOOTH, prio, &rfcomm_proto, 1); |
291 | if (!sk) | 291 | if (!sk) |
292 | return NULL; | 292 | return NULL; |
293 | 293 | ||
@@ -323,7 +323,7 @@ static struct sock *rfcomm_sock_alloc(struct socket *sock, int proto, gfp_t prio | |||
323 | return sk; | 323 | return sk; |
324 | } | 324 | } |
325 | 325 | ||
326 | static int rfcomm_sock_create(struct socket *sock, int protocol) | 326 | static int rfcomm_sock_create(struct net *net, struct socket *sock, int protocol) |
327 | { | 327 | { |
328 | struct sock *sk; | 328 | struct sock *sk; |
329 | 329 | ||
@@ -336,7 +336,7 @@ static int rfcomm_sock_create(struct socket *sock, int protocol) | |||
336 | 336 | ||
337 | sock->ops = &rfcomm_sock_ops; | 337 | sock->ops = &rfcomm_sock_ops; |
338 | 338 | ||
339 | sk = rfcomm_sock_alloc(sock, protocol, GFP_ATOMIC); | 339 | sk = rfcomm_sock_alloc(net, sock, protocol, GFP_ATOMIC); |
340 | if (!sk) | 340 | if (!sk) |
341 | return -ENOMEM; | 341 | return -ENOMEM; |
342 | 342 | ||
@@ -868,7 +868,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * | |||
868 | goto done; | 868 | goto done; |
869 | } | 869 | } |
870 | 870 | ||
871 | sk = rfcomm_sock_alloc(NULL, BTPROTO_RFCOMM, GFP_ATOMIC); | 871 | sk = rfcomm_sock_alloc(parent->sk_net, NULL, BTPROTO_RFCOMM, GFP_ATOMIC); |
872 | if (!sk) | 872 | if (!sk) |
873 | goto done; | 873 | goto done; |
874 | 874 | ||