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/dccp/ipv6.c | |
| parent | 8258175c811440e93baa15ab1962a5905686dda3 (diff) | |
| download | blackbird-op-linux-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.gz blackbird-op-linux-eee4fe4ded6e9c196168aee8f9787771f4df9c90.zip | |
[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/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 5690fbd3bf68..cf598bfc6a18 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -1173,7 +1173,6 @@ static struct inet_protosw dccp_v6_protosw = { static int __init dccp_v6_init(void) { - struct socket *socket; int err = proto_register(&dccp_v6_prot, 1); if (err != 0) @@ -1185,11 +1184,10 @@ static int __init dccp_v6_init(void) inet6_register_protosw(&dccp_v6_protosw); - err = inet_ctl_sock_create(&socket, PF_INET6, + err = inet_ctl_sock_create(&dccp_v6_ctl_sk, PF_INET6, SOCK_DCCP, IPPROTO_DCCP); if (err != 0) goto out_unregister_protosw; - dccp_v6_ctl_sk = socket->sk; out: return err; out_unregister_protosw: |
