aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-02-23 19:22:06 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:23:22 -0400
commitc5e7af0df5d7234afd8596560d9f570cfc6c18bf (patch)
treec01b2354803f79b65ab4d919570da156a761593b /net
parente0ef57cc56c3c96493f9b0d6c77bb9608eeaa173 (diff)
[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 <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index bb3f234668b3..f6ba07f0d816 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_
1240 tp->left_out = tp->sacked_out + tp->lost_out; 1240 tp->left_out = tp->sacked_out + tp->lost_out;
1241 1241
1242 if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss && 1242 if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss &&
1243 (tp->frto_highmark && after(tp->snd_una, tp->frto_highmark))) 1243 (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark)))
1244 tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); 1244 tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0);
1245 1245
1246#if FASTRETRANS_DEBUG > 0 1246#if FASTRETRANS_DEBUG > 0