diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /net/ipv4/tcp_htcp.c | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
| -rw-r--r-- | net/ipv4/tcp_htcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index 937549b8a921..26d5c7fc7de5 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c | |||
| @@ -115,8 +115,7 @@ static void measure_achieved_throughput(struct sock *sk, u32 pkts_acked, s32 rtt | |||
| 115 | return; | 115 | return; |
| 116 | 116 | ||
| 117 | /* achieved throughput calculations */ | 117 | /* achieved throughput calculations */ |
| 118 | if (icsk->icsk_ca_state != TCP_CA_Open && | 118 | if (!((1 << icsk->icsk_ca_state) & (TCPF_CA_Open | TCPF_CA_Disorder))) { |
| 119 | icsk->icsk_ca_state != TCP_CA_Disorder) { | ||
| 120 | ca->packetcount = 0; | 119 | ca->packetcount = 0; |
| 121 | ca->lasttime = now; | 120 | ca->lasttime = now; |
| 122 | return; | 121 | return; |