diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-08 21:09:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-11 10:50:17 -0400 |
| commit | 11aa9c28b4209242a9de0a661a7b3405adb568a0 (patch) | |
| tree | d0dda021d89c17c54d54d227269f937d2d73b542 /net/sctp | |
| parent | eeb1bd5c40edb0e2fd925c8535e2fdebdbc5cef2 (diff) | |
| download | op-kernel-dev-11aa9c28b4209242a9de0a661a7b3405adb568a0.zip op-kernel-dev-11aa9c28b4209242a9de0a661a7b3405adb568a0.tar.gz | |
net: Pass kern from net_proto_family.create to sk_alloc
In preparation for changing how struct net is refcounted
on kernel sockets pass the knowledge that we are creating
a kernel socket from sock_create_kern through to sk_alloc.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/ipv6.c | 2 | ||||
| -rw-r--r-- | net/sctp/protocol.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 0e4198e..e703ff7 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -635,7 +635,7 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk, struct ipv6_pinfo *newnp, *np = inet6_sk(sk); struct sctp6_sock *newsctp6sk; - newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot); + newsk = sk_alloc(sock_net(sk), PF_INET6, GFP_KERNEL, sk->sk_prot, 0); if (!newsk) goto out; diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 53b7acd..59e8035 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -550,7 +550,7 @@ static struct sock *sctp_v4_create_accept_sk(struct sock *sk, struct sctp_association *asoc) { struct sock *newsk = sk_alloc(sock_net(sk), PF_INET, GFP_KERNEL, - sk->sk_prot); + sk->sk_prot, 0); struct inet_sock *newinet; if (!newsk) |
