diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-08 22:09:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-11 10:50:17 -0400 |
commit | 11aa9c28b4209242a9de0a661a7b3405adb568a0 (patch) | |
tree | d0dda021d89c17c54d54d227269f937d2d73b542 /net/ax25 | |
parent | eeb1bd5c40edb0e2fd925c8535e2fdebdbc5cef2 (diff) |
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/ax25')
-rw-r--r-- | net/ax25/af_ax25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 330c1f4a5a0b..4273533d22b1 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -855,7 +855,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol, | |||
855 | return -ESOCKTNOSUPPORT; | 855 | return -ESOCKTNOSUPPORT; |
856 | } | 856 | } |
857 | 857 | ||
858 | sk = sk_alloc(net, PF_AX25, GFP_ATOMIC, &ax25_proto); | 858 | sk = sk_alloc(net, PF_AX25, GFP_ATOMIC, &ax25_proto, kern); |
859 | if (sk == NULL) | 859 | if (sk == NULL) |
860 | return -ENOMEM; | 860 | return -ENOMEM; |
861 | 861 | ||
@@ -881,7 +881,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) | |||
881 | struct sock *sk; | 881 | struct sock *sk; |
882 | ax25_cb *ax25, *oax25; | 882 | ax25_cb *ax25, *oax25; |
883 | 883 | ||
884 | sk = sk_alloc(sock_net(osk), PF_AX25, GFP_ATOMIC, osk->sk_prot); | 884 | sk = sk_alloc(sock_net(osk), PF_AX25, GFP_ATOMIC, osk->sk_prot, 0); |
885 | if (sk == NULL) | 885 | if (sk == NULL) |
886 | return NULL; | 886 | return NULL; |
887 | 887 | ||