diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /net/ipv4/tcp_highspeed.c | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'net/ipv4/tcp_highspeed.c')
| -rw-r--r-- | net/ipv4/tcp_highspeed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c index b72fa55dfb84..ba7c63ca5bb1 100644 --- a/net/ipv4/tcp_highspeed.c +++ b/net/ipv4/tcp_highspeed.c | |||
| @@ -135,7 +135,8 @@ static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt, | |||
| 135 | 135 | ||
| 136 | /* Do additive increase */ | 136 | /* Do additive increase */ |
| 137 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) { | 137 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) { |
| 138 | tp->snd_cwnd_cnt += ca->ai; | 138 | /* cwnd = cwnd + a(w) / cwnd */ |
| 139 | tp->snd_cwnd_cnt += ca->ai + 1; | ||
| 139 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { | 140 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { |
| 140 | tp->snd_cwnd_cnt -= tp->snd_cwnd; | 141 | tp->snd_cwnd_cnt -= tp->snd_cwnd; |
| 141 | tp->snd_cwnd++; | 142 | tp->snd_cwnd++; |