Commit c33ad6e4 authored by Baruch Even's avatar Baruch Even Committed by David S. Miller
Browse files

[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: default avatarBaruch Even <baruch@ev-en.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b191ba0d

net/ipv4/tcp_htcp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;