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/rose | |
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/rose')
-rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 8ae603069a1a..36dbc2da3661 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
@@ -520,7 +520,7 @@ static int rose_create(struct net *net, struct socket *sock, int protocol, | |||
520 | if (sock->type != SOCK_SEQPACKET || protocol != 0) | 520 | if (sock->type != SOCK_SEQPACKET || protocol != 0) |
521 | return -ESOCKTNOSUPPORT; | 521 | return -ESOCKTNOSUPPORT; |
522 | 522 | ||
523 | sk = sk_alloc(net, PF_ROSE, GFP_ATOMIC, &rose_proto); | 523 | sk = sk_alloc(net, PF_ROSE, GFP_ATOMIC, &rose_proto, kern); |
524 | if (sk == NULL) | 524 | if (sk == NULL) |
525 | return -ENOMEM; | 525 | return -ENOMEM; |
526 | 526 | ||
@@ -559,7 +559,7 @@ static struct sock *rose_make_new(struct sock *osk) | |||
559 | if (osk->sk_type != SOCK_SEQPACKET) | 559 | if (osk->sk_type != SOCK_SEQPACKET) |
560 | return NULL; | 560 | return NULL; |
561 | 561 | ||
562 | sk = sk_alloc(sock_net(osk), PF_ROSE, GFP_ATOMIC, &rose_proto); | 562 | sk = sk_alloc(sock_net(osk), PF_ROSE, GFP_ATOMIC, &rose_proto, 0); |
563 | if (sk == NULL) | 563 | if (sk == NULL) |
564 | return NULL; | 564 | return NULL; |
565 | 565 | ||