Commit 571a5dd8 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

htcp: merge icsk_ca_state compare 



Similar to what is done elsewhere in TCP code when double
state checks are being done.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6c7d085

net/ipv4/tcp_htcp.c

+1 −2
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt 
		return;



	/* achieved throughput calculations */

	if (icsk->icsk_ca_state != TCP_CA_Open &&

	    icsk->icsk_ca_state != TCP_CA_Disorder) {

	if (!((1 << icsk->icsk_ca_state) & (TCPF_CA_Open | TCPF_CA_Disorder))) {

		ca->packetcount = 0;

		ca->lasttime = now;

		return;