diff options
author | Satoru SATOH <satoru.satoh@gmail.com> | 2007-12-16 17:00:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-12-16 17:00:19 -0500 |
commit | 488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15 (patch) | |
tree | 6e8eca37bbfd76d9c7875df6c5016c57dae316dd /net/ipv4 | |
parent | cf6fc4a92400decda932e5ab97b46916919142b1 (diff) |
[IPV4]: Make tcp_input_metrics() get minimum RTO via tcp_rto_min()
tcp_input_metrics() refers to the built-time constant TCP_RTO_MIN
regardless of configured minimum RTO with iproute2.
Signed-off-by: Satoru SATOH <satoru.satoh@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index b9e429d2d1de..889c89362bfc 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -923,7 +923,7 @@ static void tcp_init_metrics(struct sock *sk) | |||
923 | } | 923 | } |
924 | if (dst_metric(dst, RTAX_RTTVAR) > tp->mdev) { | 924 | if (dst_metric(dst, RTAX_RTTVAR) > tp->mdev) { |
925 | tp->mdev = dst_metric(dst, RTAX_RTTVAR); | 925 | tp->mdev = dst_metric(dst, RTAX_RTTVAR); |
926 | tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN); | 926 | tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk)); |
927 | } | 927 | } |
928 | tcp_set_rto(sk); | 928 | tcp_set_rto(sk); |
929 | tcp_bound_rto(sk); | 929 | tcp_bound_rto(sk); |