[TCP] H-TCP: Use msecs_to_jiffies

Use functions to calculate jiffies from milliseconds and not the old,
crude method of dividing HZ by a value. Ensures more accurate values
even in the face of strange HZ values.

Signed-off-By: Baruch Even <baruch@ev-en.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 128de4d7c0b7dd40c95d94b3efdbab73a2e20041..fda2f873599e64ed6b24f41bbb0f2e77c53ddbed 100644 (file)
--- a/net/ipv4/tcp_htcp.c
+++ b/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;