---

yaml --- r: 361838 b: refs/heads/master c: 7ebe183 h: refs/heads/master v: v3
git-mirror · Mar 24, 2013 · 05157b4 · 05157b4
1 parent 65239df
commit 05157b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fe7f99a9e11a43183bc27420309ae105e1fec1a
+refs/heads/master: 7ebe183c6d444ef5587d803b64a1f4734b18c564
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -2059,11 +2059,8 @@ void tcp_enter_loss(struct sock *sk, int how)
 	if (tcp_is_reno(tp))
 		tcp_reset_reno_sack(tp);
 
-	if (!how) {
-		/* Push undo marker, if it was plain RTO and nothing
-		 * was retransmitted. */
-		tp->undo_marker = tp->snd_una;
-	} else {
+	tp->undo_marker = tp->snd_una;
+	if (how) {
 		tp->sacked_out = 0;
 		tp->fackets_out = 0;
 	}