---

yaml --- r: 299020 b: refs/heads/master c: 18a223e h: refs/heads/master v: v3
git-mirror · Apr 10, 2012 · af24833 · af24833
1 parent 824b91e
commit af24833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb84b1428b271f8767e0eb3fcd7231896edfaa4
+refs/heads/master: 18a223e0b9ec8979320ba364b47c9772391d6d05
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -474,8 +474,11 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)
 		if (!win_dep) {
 			m -= (new_sample >> 3);
 			new_sample += m;
-		} else if (m < new_sample)
-			new_sample = m << 3;
+		} else {
+			m <<= 3;
+			if (m < new_sample)
+				new_sample = m;
+		}
 	} else {
 		/* No previous measure. */
 		new_sample = m << 3;