aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorSatoru SATOH <satoru.satoh@gmail.com>2007-12-16 14:00:19 -0800
committerDavid S. Miller <davem@davemloft.net>2007-12-16 14:00:19 -0800
commit488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15 (patch)
tree6e8eca37bbfd76d9c7875df6c5016c57dae316dd /net/ipv4
parent[IPV6]: Fix the return value of ipv6_getsockopt (diff)
downloadlinux-dev-488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15.tar.xz
linux-dev-488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15.zip
[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.c2
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)
}
if (dst_metric(dst, RTAX_RTTVAR) > tp->mdev) {
tp->mdev = dst_metric(dst, RTAX_RTTVAR);
- tp->mdev_max = tp->rttvar = max(tp->mdev, TCP_RTO_MIN);
+ tp->mdev_max = tp->rttvar = max(tp->mdev, tcp_rto_min(sk));
}
tcp_set_rto(sk);
tcp_bound_rto(sk);