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

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
...@@ -115,8 +115,7 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt ...@@ -115,8 +115,7 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt
return; return;
/* achieved throughput calculations */ /* achieved throughput calculations */
if (icsk->icsk_ca_state != TCP_CA_Open && if (!((1 << icsk->icsk_ca_state) & (TCPF_CA_Open | TCPF_CA_Disorder))) {
icsk->icsk_ca_state != TCP_CA_Disorder) {
ca->packetcount = 0; ca->packetcount = 0;
ca->lasttime = now; ca->lasttime = now;
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment