diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /net/ipv4/tcp_hybla.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'net/ipv4/tcp_hybla.c')
| -rw-r--r-- | net/ipv4/tcp_hybla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c index c209e054a634..377bc9349371 100644 --- a/net/ipv4/tcp_hybla.c +++ b/net/ipv4/tcp_hybla.c | |||
| @@ -126,8 +126,8 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 126 | * calculate 2^fract in a <<7 value. | 126 | * calculate 2^fract in a <<7 value. |
| 127 | */ | 127 | */ |
| 128 | is_slowstart = 1; | 128 | is_slowstart = 1; |
| 129 | increment = ((1 << ca->rho) * hybla_fraction(rho_fractions)) | 129 | increment = ((1 << min(ca->rho, 16U)) * |
| 130 | - 128; | 130 | hybla_fraction(rho_fractions)) - 128; |
| 131 | } else { | 131 | } else { |
| 132 | /* | 132 | /* |
| 133 | * congestion avoidance | 133 | * congestion avoidance |