From 4c0c28e6a5c7ceecf33eac1a43ee97a55a24dbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Thu, 15 Nov 2007 19:33:31 -0800 Subject: [PATCH] --- yaml --- r: 78123 b: refs/heads/master c: b9d86585dc6c9265aa373c7036458fe8aa7627c6 h: refs/heads/master i: 78121: 5671288eddf3392b139c395569978b2931efe026 78119: 6cc53ba7f77ec1b9a3b1dec34d71a2c5d648d50f v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 53bd43db422d..add000f723fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362 +refs/heads/master: b9d86585dc6c9265aa373c7036458fe8aa7627c6 diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index b39f0d86e44c..901240f40688 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -1406,28 +1406,25 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ if (unlikely(in_sack < 0)) break; + if (!in_sack) { + fack_count += tcp_skb_pcount(skb); + continue; + } + sacked = TCP_SKB_CB(skb)->sacked; /* Account D-SACK for retransmitted packet. */ - if ((dup_sack && in_sack) && - (sacked & TCPCB_RETRANS) && - after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker)) - tp->undo_retrans--; - - /* The frame is ACKed. */ - if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una)) { - if (sacked&TCPCB_RETRANS) { - if ((dup_sack && in_sack) && - (sacked&TCPCB_SACKED_ACKED)) - reord = min(fack_count, reord); - } - - /* Nothing to do; acked frame is about to be dropped. */ - fack_count += tcp_skb_pcount(skb); - continue; + if (dup_sack && (sacked & TCPCB_RETRANS)) { + if (after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker)) + tp->undo_retrans--; + if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una) && + (sacked & TCPCB_SACKED_ACKED)) + reord = min(fack_count, reord); } - if (!in_sack) { + + /* Nothing to do; acked frame is about to be dropped (was ACKed). */ + if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una)) { fack_count += tcp_skb_pcount(skb); continue; }