---

yaml --- r: 74882 b: refs/heads/master c: 488faa2 h: refs/heads/master v: v3
git-mirror · Dec 16, 2007 · 9e6d547 · 9e6d547
1 parent f964678
commit 9e6d547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6fc4a92400decda932e5ab97b46916919142b1
+refs/heads/master: 488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/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);