[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, 8 insertions, 8 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 7ab0bd64c9d1..cad664bf3f2e 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1250,19 +1250,21 @@ out:
         return segs;
 }
 
-int inet_ctl_sock_create(struct socket **sock, unsigned short family,
+int inet_ctl_sock_create(struct sock **sk, unsigned short family,
                          unsigned short type, unsigned char protocol)
 {
-        int rc = sock_create_kern(family, type, protocol, sock);
+        struct socket *sock;
+        int rc = sock_create_kern(family, type, protocol, &sock);
 
         if (rc == 0) {
-                (*sock)->sk->sk_allocation = GFP_ATOMIC;
-                inet_sk((*sock)->sk)->uc_ttl = -1;
+                *sk = sock->sk;
+                (*sk)->sk_allocation = GFP_ATOMIC;
+                inet_sk(*sk)->uc_ttl = -1;
                 /*
                  * Unhash it so that IP input processing does not even see it,
                  * we do not wish this socket to see incoming packets.
                  */
-                (*sock)->sk->sk_prot->unhash((*sock)->sk);
+                (*sk)->sk_prot->unhash(*sk);
         }
         return rc;
 }
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index edf5a37bb5c3..cfe5df76e14b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2490,11 +2490,9 @@ struct proto tcp_prot = {
 
 void __init tcp_v4_init(void)
 {
-        struct socket *__tcp_socket;
-        if (inet_ctl_sock_create(&__tcp_socket, PF_INET, SOCK_RAW,
+        if (inet_ctl_sock_create(&tcp_sock, PF_INET, SOCK_RAW,
                                  IPPROTO_TCP) < 0)
                 panic("Failed to create the TCP control socket.\n");
-        tcp_sock = __tcp_socket->sk;
 }
 
 EXPORT_SYMBOL(ipv4_specific);