From 4ed28fd4966cab390e19f522f3af73638c85a0b0 Mon Sep 17 00:00:00 2001
From: Daniele Lacamera <root@danielinux.net>
Date: Wed, 2 Jun 2010 02:02:04 +0000
Subject: [PATCH] --- yaml --- r: 200151 b: refs/heads/master c:
 edafe502404f3669d364b6e96d79b54067b634b4 h: refs/heads/master i:   200149:
 6b73ec92024bc3d9528983d2b5d0a5fbe8c018ed   200147:
 5fc3d20a4922e2caff3fc4f9f6fcd751ddb6c392   200143:
 990848f2c34528afdfc2ac4840c0c00b46013bec v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_hybla.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 773dae9f1a84..b244b90f5523 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c29dde7d04dc0ec0edb649d20ccf1351c13a06
+refs/heads/master: edafe502404f3669d364b6e96d79b54067b634b4
diff --git a/trunk/net/ipv4/tcp_hybla.c b/trunk/net/ipv4/tcp_hybla.c
index c209e054a634..377bc9349371 100644
--- a/trunk/net/ipv4/tcp_hybla.c
+++ b/trunk/net/ipv4/tcp_hybla.c
@@ -126,8 +126,8 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
 		 * calculate 2^fract in a <<7 value.
 		 */
 		is_slowstart = 1;
-		increment = ((1 << ca->rho) * hybla_fraction(rho_fractions))
-			- 128;
+		increment = ((1 << min(ca->rho, 16U)) *
+			hybla_fraction(rho_fractions)) - 128;
 	} else {
 		/*
 		 * congestion avoidance