aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.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/ipv4.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/ipv4.c')
-rw-r--r--net/dccp/ipv4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index feb3fa5b7141..5669c895c873 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -991,7 +991,6 @@ static struct inet_protosw dccp_v4_protosw = {
991 991
992static int __init dccp_v4_init(void) 992static int __init dccp_v4_init(void)
993{ 993{
994 struct socket *socket;
995 int err = proto_register(&dccp_v4_prot, 1); 994 int err = proto_register(&dccp_v4_prot, 1);
996 995
997 if (err != 0) 996 if (err != 0)
@@ -1003,11 +1002,10 @@ static int __init dccp_v4_init(void)
1003 1002
1004 inet_register_protosw(&dccp_v4_protosw); 1003 inet_register_protosw(&dccp_v4_protosw);
1005 1004
1006 err = inet_ctl_sock_create(&socket, PF_INET, 1005 err = inet_ctl_sock_create(&dccp_v4_ctl_sk, PF_INET,
1007 SOCK_DCCP, IPPROTO_DCCP); 1006 SOCK_DCCP, IPPROTO_DCCP);
1008 if (err) 1007 if (err)
1009 goto out_unregister_protosw; 1008 goto out_unregister_protosw;
1010 dccp_v4_ctl_sk = socket->sk;
1011out: 1009out:
1012 return err; 1010 return err;
1013out_unregister_protosw: 1011out_unregister_protosw: