---

yaml --- r: 4142 b: refs/heads/master c: cb83199 h: refs/heads/master v: v3
git-mirror · Jul 5, 2005 · 88aed86 · 88aed86
1 parent 1de2143
commit 88aed86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a56476962e92a6c389a1a561274d4a27607b7b5f
+refs/heads/master: cb83199a29dc0408423d6df432f28cc67fcadaf4
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -2038,7 +2038,8 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p, s32 *seq_usrtt
 		 * the other end.
 		 */
 		if (after(scb->end_seq, tp->snd_una)) {
-			if (tcp_skb_pcount(skb) > 1)
+			if (tcp_skb_pcount(skb) > 1 &&
+			    after(tp->snd_una, scb->seq))
 				acked |= tcp_tso_acked(sk, skb,
 						       now, &seq_rtt);
 			break;