diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2009-09-15 04:30:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-15 04:30:10 -0400 |
commit | 0b6a05c1dbebe8c616e2e5b0f52b7a01fd792911 (patch) | |
tree | 18b5a2d16ac3fa8dd6d4528469725c216aed428c /net/ipv6 | |
parent | 036d6a673fa0a2e2c5b72a3b1d1b86114c1711c0 (diff) |
tcp: fix ssthresh u16 leftover
It was once upon time so that snd_sthresh was a 16-bit quantity.
...That has not been true for long period of time. I run across
some ancient compares which still seem to trust such legacy.
Put all that magic into a single place, I hopefully found all
of them.
Compile tested, though linking of allyesconfig is ridiculous
nowadays it seems.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
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, 3 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 7718a9261efb..21d100b68b19 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1846,7 +1846,7 @@ static int tcp_v6_init_sock(struct sock *sk) | |||
1846 | /* See draft-stevens-tcpca-spec-01 for discussion of the | 1846 | /* See draft-stevens-tcpca-spec-01 for discussion of the |
1847 | * initialization of these values. | 1847 | * initialization of these values. |
1848 | */ | 1848 | */ |
1849 | tp->snd_ssthresh = 0x7fffffff; | 1849 | tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; |
1850 | tp->snd_cwnd_clamp = ~0; | 1850 | tp->snd_cwnd_clamp = ~0; |
1851 | tp->mss_cache = 536; | 1851 | tp->mss_cache = 536; |
1852 | 1852 | ||
@@ -1969,7 +1969,8 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) | |||
1969 | jiffies_to_clock_t(icsk->icsk_rto), | 1969 | jiffies_to_clock_t(icsk->icsk_rto), |
1970 | jiffies_to_clock_t(icsk->icsk_ack.ato), | 1970 | jiffies_to_clock_t(icsk->icsk_ack.ato), |
1971 | (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, | 1971 | (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, |
1972 | tp->snd_cwnd, tp->snd_ssthresh>=0xFFFF?-1:tp->snd_ssthresh | 1972 | tp->snd_cwnd, |
1973 | tcp_in_initial_slowstart(tp) ? -1 : tp->snd_ssthresh | ||
1973 | ); | 1974 | ); |
1974 | } | 1975 | } |
1975 | 1976 | ||