From: Ilpo Järvinen Date: Sat, 24 Feb 2007 00:22:06 +0000 (-0800) Subject: [TCP]: Correct reordering detection change (no FRTO case) X-Git-Tag: v2.6.22-rc1~1128^2~424 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c5e7af0df5d7234afd8596560d9f570cfc6c18bf;p=linux-2.6-omap-h63xx.git [TCP]: Correct reordering detection change (no FRTO case) The reordering detection must work also when FRTO has not been used at all which was the original intention of mine, just the expression of the idea was flawed. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller --- diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index bb3f234668b..f6ba07f0d81 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1240,7 +1240,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ tp->left_out = tp->sacked_out + tp->lost_out; if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss && - (tp->frto_highmark && after(tp->snd_una, tp->frto_highmark))) + (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark))) tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); #if FASTRETRANS_DEBUG > 0