diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 14:27:58 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 14:27:58 -0700 |
commit | eee4fe4ded6e9c196168aee8f9787771f4df9c90 (patch) | |
tree | 271a5837eef0a7f25bf7c8e1e36f413271dd70c7 /net/ipv4/af_inet.c | |
parent | 8258175c811440e93baa15ab1962a5905686dda3 (diff) | |
download | kernel_samsung_tuna-eee4fe4ded6e9c196168aee8f9787771f4df9c90.zip kernel_samsung_tuna-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.gz kernel_samsung_tuna-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.bz2 |
[INET]: Let inet_ctl_sock_create return sock rather than socket.
All upper protocol layers are already use sock internally.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 7ab0bd6..cad664b 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1250,19 +1250,21 @@ out: return segs; } -int inet_ctl_sock_create(struct socket **sock, unsigned short family, +int inet_ctl_sock_create(struct sock **sk, unsigned short family, unsigned short type, unsigned char protocol) { - int rc = sock_create_kern(family, type, protocol, sock); + struct socket *sock; + int rc = sock_create_kern(family, type, protocol, &sock); if (rc == 0) { - (*sock)->sk->sk_allocation = GFP_ATOMIC; - inet_sk((*sock)->sk)->uc_ttl = -1; + *sk = sock->sk; + (*sk)->sk_allocation = GFP_ATOMIC; + inet_sk(*sk)->uc_ttl = -1; /* * Unhash it so that IP input processing does not even see it, * we do not wish this socket to see incoming packets. */ - (*sock)->sk->sk_prot->unhash((*sock)->sk); + (*sk)->sk_prot->unhash(*sk); } return rc; } |