diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-02-23 16:22:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:23:22 -0700 |
| commit | c5e7af0df5d7234afd8596560d9f570cfc6c18bf (patch) | |
| tree | c01b2354803f79b65ab4d919570da156a761593b | |
| parent | e0ef57cc56c3c96493f9b0d6c77bb9608eeaa173 (diff) | |
| download | op-kernel-dev-c5e7af0df5d7234afd8596560d9f570cfc6c18bf.zip op-kernel-dev-c5e7af0df5d7234afd8596560d9f570cfc6c18bf.tar.gz | |
[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>
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index bb3f234..f6ba07f 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 |
