[INET]: Let inet_ctl_sock_create return sock rather than socket.

[karo-tx-linux.git] / net / dccp / ipv6.c

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 5690fbd3bf688ebac66eb79a01aa58e1952dd01f..cf598bfc6a18ed01a9d93aa4b00931496b4d0099 100644 (file)
--- 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: