---

yaml --- r: 200151 b: refs/heads/master c: edafe50 h: refs/heads/master i: 200149: 6b73ec9 200147: 5fc3d20 200143: 990848f v: v3
git-mirror · Jun 2, 2010 · 4ed28fd · 4ed28fd
1 parent c580e31
commit 4ed28fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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