From e7bea9a85cf9e57c1951634d309425dbd2b4a9dc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 7 Aug 2007 18:29:05 -0700 Subject: [PATCH] --- yaml --- r: 63821 b: refs/heads/master c: f34d1955dff5a5769d24614d137003f0316406f3 h: refs/heads/master i: 63819: 2305c6590693a5a2f855fd33b4898e67ad87cd12 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_htcp.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5a9af87bafb5..8f489cd4d37a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 591e620693e71e24fb3450a4084217e44b7a60b6 +refs/heads/master: f34d1955dff5a5769d24614d137003f0316406f3 diff --git a/trunk/net/ipv4/tcp_htcp.c b/trunk/net/ipv4/tcp_htcp.c index b66556c0a5bd..5215691f2760 100644 --- a/trunk/net/ipv4/tcp_htcp.c +++ b/trunk/net/ipv4/tcp_htcp.c @@ -79,7 +79,6 @@ static u32 htcp_cwnd_undo(struct sock *sk) static inline void measure_rtt(struct sock *sk, u32 srtt) { const struct inet_connection_sock *icsk = inet_csk(sk); - const struct tcp_sock *tp = tcp_sk(sk); struct htcp *ca = inet_csk_ca(sk); /* keep track of minimum RTT seen so far, minRTT is zero at first */ @@ -87,8 +86,7 @@ static inline void measure_rtt(struct sock *sk, u32 srtt) ca->minRTT = srtt; /* max RTT */ - if (icsk->icsk_ca_state == TCP_CA_Open - && tp->snd_ssthresh < 0xFFFF && htcp_ccount(ca) > 3) { + if (icsk->icsk_ca_state == TCP_CA_Open) { if (ca->maxRTT < ca->minRTT) ca->maxRTT = ca->minRTT; if (ca->maxRTT < srtt