diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-03 14:27:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 14:27:58 -0700 |
| commit | eee4fe4ded6e9c196168aee8f9787771f4df9c90 (patch) | |
| tree | 271a5837eef0a7f25bf7c8e1e36f413271dd70c7 /net/ipv4/tcp_ipv4.c | |
| parent | 8258175c811440e93baa15ab1962a5905686dda3 (diff) | |
| download | op-kernel-dev-eee4fe4ded6e9c196168aee8f9787771f4df9c90.zip op-kernel-dev-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.gz | |
[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/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index edf5a37..cfe5df7 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); |
