aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r--net/bluetooth/l2cap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c4e4ce4ebb2b..36ef27b625db 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -518,11 +518,11 @@ static struct proto l2cap_proto = {
518 .obj_size = sizeof(struct l2cap_pinfo) 518 .obj_size = sizeof(struct l2cap_pinfo)
519}; 519};
520 520
521static struct sock *l2cap_sock_alloc(struct socket *sock, int proto, gfp_t prio) 521static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio)
522{ 522{
523 struct sock *sk; 523 struct sock *sk;
524 524
525 sk = sk_alloc(PF_BLUETOOTH, prio, &l2cap_proto, 1); 525 sk = sk_alloc(net, PF_BLUETOOTH, prio, &l2cap_proto, 1);
526 if (!sk) 526 if (!sk)
527 return NULL; 527 return NULL;
528 528
@@ -543,7 +543,7 @@ static struct sock *l2cap_sock_alloc(struct socket *sock, int proto, gfp_t prio)
543 return sk; 543 return sk;
544} 544}
545 545
546static int l2cap_sock_create(struct socket *sock, int protocol) 546static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol)
547{ 547{
548 struct sock *sk; 548 struct sock *sk;
549 549
@@ -560,7 +560,7 @@ static int l2cap_sock_create(struct socket *sock, int protocol)
560 560
561 sock->ops = &l2cap_sock_ops; 561 sock->ops = &l2cap_sock_ops;
562 562
563 sk = l2cap_sock_alloc(sock, protocol, GFP_ATOMIC); 563 sk = l2cap_sock_alloc(net, sock, protocol, GFP_ATOMIC);
564 if (!sk) 564 if (!sk)
565 return -ENOMEM; 565 return -ENOMEM;
566 566
@@ -1425,7 +1425,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
1425 goto response; 1425 goto response;
1426 } 1426 }
1427 1427
1428 sk = l2cap_sock_alloc(NULL, BTPROTO_L2CAP, GFP_ATOMIC); 1428 sk = l2cap_sock_alloc(parent->sk_net, NULL, BTPROTO_L2CAP, GFP_ATOMIC);
1429 if (!sk) 1429 if (!sk)
1430 goto response; 1430 goto response;
1431 1431