[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>

2 files changed, 2 insertions, 6 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 = {
 
 static int __init dccp_v4_init(void)
 {
-        struct socket *socket;
         int err = proto_register(&dccp_v4_prot, 1);
 
         if (err != 0)
@@ -1003,11 +1002,10 @@ static int __init dccp_v4_init(void)
 
         inet_register_protosw(&dccp_v4_protosw);
 
-        err = inet_ctl_sock_create(&socket, PF_INET,
+        err = inet_ctl_sock_create(&dccp_v4_ctl_sk, PF_INET,
                                    SOCK_DCCP, IPPROTO_DCCP);
         if (err)
                 goto out_unregister_protosw;
-        dccp_v4_ctl_sk = socket->sk;
 out:
         return err;
 out_unregister_protosw:
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: