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/ipv6 | |
| parent | [SCTP]: Replace socket with sock for SCTP control socket. (diff) | |
| download | linux-dev-eee4fe4ded6e9c196168aee8f9787771f4df9c90.tar.xz linux-dev-eee4fe4ded6e9c196168aee8f9787771f4df9c90.zip | |
[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/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d98222fba041..2882cc51669e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -2200,14 +2200,13 @@ static struct inet_protosw tcpv6_protosw = { static int tcpv6_net_init(struct net *net) { int err; - struct socket *sock; struct sock *sk; - err = inet_ctl_sock_create(&sock, PF_INET6, SOCK_RAW, IPPROTO_TCP); + err = inet_ctl_sock_create(&sk, PF_INET6, SOCK_RAW, IPPROTO_TCP); if (err) return err; - net->ipv6.tcp_sk = sk = sock->sk; + net->ipv6.tcp_sk = sk; sk_change_net(sk, net); return err; } |