aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv6.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-03 17:27:58 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-03 17:27:58 -0400
commiteee4fe4ded6e9c196168aee8f9787771f4df9c90 (patch)
tree271a5837eef0a7f25bf7c8e1e36f413271dd70c7 /net/dccp/ipv6.c
parent8258175c811440e93baa15ab1962a5905686dda3 (diff)
[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.c4
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 = {
1173 1173
1174static int __init dccp_v6_init(void) 1174static int __init dccp_v6_init(void)
1175{ 1175{
1176 struct socket *socket;
1177 int err = proto_register(&dccp_v6_prot, 1); 1176 int err = proto_register(&dccp_v6_prot, 1);
1178 1177
1179 if (err != 0) 1178 if (err != 0)
@@ -1185,11 +1184,10 @@ static int __init dccp_v6_init(void)
1185 1184
1186 inet6_register_protosw(&dccp_v6_protosw); 1185 inet6_register_protosw(&dccp_v6_protosw);
1187 1186
1188 err = inet_ctl_sock_create(&socket, PF_INET6, 1187 err = inet_ctl_sock_create(&dccp_v6_ctl_sk, PF_INET6,
1189 SOCK_DCCP, IPPROTO_DCCP); 1188 SOCK_DCCP, IPPROTO_DCCP);
1190 if (err != 0) 1189 if (err != 0)
1191 goto out_unregister_protosw; 1190 goto out_unregister_protosw;
1192 dccp_v6_ctl_sk = socket->sk;
1193out: 1191out:
1194 return err; 1192 return err;
1195out_unregister_protosw: 1193out_unregister_protosw: