From be71f217b8943207297242b24f754a037d3937bd Mon Sep 17 00:00:00 2001
From: Baruch Even <baruch@ev-en.org>
Date: Mon, 20 Mar 2006 22:22:20 -0800
Subject: [PATCH] --- yaml --- r: 22243 b: refs/heads/master c:
 c33ad6e476e4cdc245215f3eb5b3df353df1b370 h: refs/heads/master i:   22241:
 52ee0612b1c580630fe1fdc54bd9fd8c9577cc32   22239:
 b3e3f4668d2fb17c2c2dee4632fabe2319ed76b2 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_htcp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2d153b24245f..c851c0c5d7b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b191ba0d599928372be5a89f75486eb58efab48a
+refs/heads/master: c33ad6e476e4cdc245215f3eb5b3df353df1b370
diff --git a/trunk/net/ipv4/tcp_htcp.c b/trunk/net/ipv4/tcp_htcp.c
index 128de4d7c0b7..fda2f873599e 100644
--- a/trunk/net/ipv4/tcp_htcp.c
+++ b/trunk/net/ipv4/tcp_htcp.c
@@ -80,7 +80,7 @@ static inline void measure_rtt(struct sock *sk)
 	if (icsk->icsk_ca_state == TCP_CA_Open && tp->snd_ssthresh < 0xFFFF && ca->ccount > 3) {
 		if (ca->maxRTT < ca->minRTT)
 			ca->maxRTT = ca->minRTT;
-		if (ca->maxRTT < srtt && srtt <= ca->maxRTT+HZ/50)
+		if (ca->maxRTT < srtt && srtt <= ca->maxRTT+msecs_to_jiffies(20))
 			ca->maxRTT = srtt;
 	}
 }
@@ -135,7 +135,7 @@ static inline void htcp_beta_update(struct htcp *ca, u32 minRTT, u32 maxRTT)
 		}
 	}
 
-	if (ca->modeswitch && minRTT > max(HZ/100, 1) && maxRTT) {
+	if (ca->modeswitch && minRTT > msecs_to_jiffies(10) && maxRTT) {
 		ca->beta = (minRTT<<7)/maxRTT;
 		if (ca->beta < BETA_MIN)
 			ca->beta = BETA_MIN;