projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'linux-kselftest-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
net
/
atm
/
common.c
diff --git
a/net/atm/common.c
b/net/atm/common.c
index
ed04666
..
49a872d
100644
(file)
--- a/
net/atm/common.c
+++ b/
net/atm/common.c
@@
-141,7
+141,7
@@
static struct proto vcc_proto = {
.release_cb = vcc_release_cb,
};
.release_cb = vcc_release_cb,
};
-int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
+int vcc_create(struct net *net, struct socket *sock, int protocol, int family
, int kern
)
{
struct sock *sk;
struct atm_vcc *vcc;
{
struct sock *sk;
struct atm_vcc *vcc;
@@
-149,7
+149,7
@@
int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
sock->sk = NULL;
if (sock->type == SOCK_STREAM)
return -EINVAL;
sock->sk = NULL;
if (sock->type == SOCK_STREAM)
return -EINVAL;
- sk = sk_alloc(net, family, GFP_KERNEL, &vcc_proto);
+ sk = sk_alloc(net, family, GFP_KERNEL, &vcc_proto
, kern
);
if (!sk)
return -ENOMEM;
sock_init_data(sock, sk);
if (!sk)
return -ENOMEM;
sock_init_data(sock, sk);