diff options
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 825e8fb5114b..b2338e971b33 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -269,12 +269,12 @@ static struct proto rfcomm_proto = { | |||
269 | .obj_size = sizeof(struct rfcomm_pinfo) | 269 | .obj_size = sizeof(struct rfcomm_pinfo) |
270 | }; | 270 | }; |
271 | 271 | ||
272 | static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio) | 272 | static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio, int kern) |
273 | { | 273 | { |
274 | struct rfcomm_dlc *d; | 274 | struct rfcomm_dlc *d; |
275 | struct sock *sk; | 275 | struct sock *sk; |
276 | 276 | ||
277 | sk = sk_alloc(net, PF_BLUETOOTH, prio, &rfcomm_proto); | 277 | sk = sk_alloc(net, PF_BLUETOOTH, prio, &rfcomm_proto, kern); |
278 | if (!sk) | 278 | if (!sk) |
279 | return NULL; | 279 | return NULL; |
280 | 280 | ||
@@ -324,7 +324,7 @@ static int rfcomm_sock_create(struct net *net, struct socket *sock, | |||
324 | 324 | ||
325 | sock->ops = &rfcomm_sock_ops; | 325 | sock->ops = &rfcomm_sock_ops; |
326 | 326 | ||
327 | sk = rfcomm_sock_alloc(net, sock, protocol, GFP_ATOMIC); | 327 | sk = rfcomm_sock_alloc(net, sock, protocol, GFP_ATOMIC, kern); |
328 | if (!sk) | 328 | if (!sk) |
329 | return -ENOMEM; | 329 | return -ENOMEM; |
330 | 330 | ||
@@ -969,7 +969,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * | |||
969 | goto done; | 969 | goto done; |
970 | } | 970 | } |
971 | 971 | ||
972 | sk = rfcomm_sock_alloc(sock_net(parent), NULL, BTPROTO_RFCOMM, GFP_ATOMIC); | 972 | sk = rfcomm_sock_alloc(sock_net(parent), NULL, BTPROTO_RFCOMM, GFP_ATOMIC, 0); |
973 | if (!sk) | 973 | if (!sk) |
974 | goto done; | 974 | goto done; |
975 | 975 | ||