diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:24:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:24:21 -0800 |
| commit | 79ffeeb9e66da8c60de8c8ab676658bcbc47c1f7 (patch) | |
| tree | f3c3841e1d4b5c7cd3695fe34ff23e0be08d7dac /net/ipv4/tcp_htcp.c | |
| parent | a5aac37f1cdbbd1e587fc618e778ddae124e5ac3 (diff) | |
| parent | 6a438bbe68c7013a42d9c5aee5a40d7dafdbe6ec (diff) | |
| download | kernel-crypto-79ffeeb9e66da8c60de8c8ab676658bcbc47c1f7.tar.gz kernel-crypto-79ffeeb9e66da8c60de8c8ab676658bcbc47c1f7.tar.xz kernel-crypto-79ffeeb9e66da8c60de8c8ab676658bcbc47c1f7.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
| -rw-r--r-- | net/ipv4/tcp_htcp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c index e47b37984e9..3284cfb993e 100644 --- a/net/ipv4/tcp_htcp.c +++ b/net/ipv4/tcp_htcp.c @@ -207,14 +207,13 @@ static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, struct tcp_sock *tp = tcp_sk(sk); struct htcp *ca = inet_csk_ca(sk); - if (in_flight < tp->snd_cwnd) + if (!tcp_is_cwnd_limited(sk, in_flight)) return; - if (tp->snd_cwnd <= tp->snd_ssthresh) { - /* In "safe" area, increase. */ - if (tp->snd_cwnd < tp->snd_cwnd_clamp) - tp->snd_cwnd++; - } else { + if (tp->snd_cwnd <= tp->snd_ssthresh) + tcp_slow_start(tp); + else { + measure_rtt(sk); /* keep track of number of round-trip times since last backoff event */ @@ -224,7 +223,7 @@ static void htcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, htcp_alpha_update(ca); } - /* In dangerous area, increase slowly. + /* In dangerous area, increase slowly. * In theory this is tp->snd_cwnd += alpha / tp->snd_cwnd */ if ((tp->snd_cwnd_cnt++ * ca->alpha)>>7 >= tp->snd_cwnd) { |