diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:31:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:31:46 -0400 |
| commit | 59a49e38711a146dc0bef4837c825b5422335460 (patch) | |
| tree | 7e6e3d1850159f94e5b05d1c5775bd3cc87c3690 /net/ipv6/tcp_ipv6.c | |
| parent | 52c1da39534fb382c061de58b65f678ad74b59f5 (diff) | |
| parent | f2d368fa3ef90f2159d9e542303901ebf68144dd (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index fce56039b0e9..9dac7fdf4726 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -2025,7 +2025,7 @@ static int tcp_v6_init_sock(struct sock *sk) | |||
| 2025 | sk->sk_state = TCP_CLOSE; | 2025 | sk->sk_state = TCP_CLOSE; |
| 2026 | 2026 | ||
| 2027 | tp->af_specific = &ipv6_specific; | 2027 | tp->af_specific = &ipv6_specific; |
| 2028 | tp->ca_ops = &tcp_reno; | 2028 | tp->ca_ops = &tcp_init_congestion_ops; |
| 2029 | sk->sk_write_space = sk_stream_write_space; | 2029 | sk->sk_write_space = sk_stream_write_space; |
| 2030 | sock_set_flag(sk, SOCK_USE_WRITE_QUEUE); | 2030 | sock_set_flag(sk, SOCK_USE_WRITE_QUEUE); |
| 2031 | 2031 | ||