From 5e165da2a01ee00032f7c05c8fae991c88a9d309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Sat, 28 Feb 2009 04:44:27 +0000 Subject: [PATCH] --- yaml --- r: 134973 b: refs/heads/master c: ac11ba753f3aa839292c1a3b6c971c637ad2e839 h: refs/heads/master i: 134971: 917162f8edd032a6792d98d42357043a2841dd42 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9aef0c6d068a..17f030a4cd10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79cb5def8dcad1a978841118bd14e155b3fd5589 +refs/heads/master: ac11ba753f3aa839292c1a3b6c971c637ad2e839 diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index f6f61b3e677b..2471cd4f66db 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -2065,7 +2065,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk) goto begin_fwd; } else if (!(sacked & TCPCB_LOST)) { - if (hole == NULL && !(sacked & TCPCB_SACKED_RETRANS)) + if (hole == NULL && !(sacked & (TCPCB_SACKED_RETRANS|TCPCB_SACKED_ACKED))) hole = skb; continue;