diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-11-29 14:59:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 23:55:10 +0100 |
| commit | ea4f76ae13b4240dac304ed50636391d6b22e9c5 (patch) | |
| tree | 7b26858bfa3cfd4cccd7d667b55fefbf7208698a /net/ipv4/tcp_input.c | |
| parent | [NET]: Nicer WARN_ON in netstat_show (diff) | |
| download | linux-ea4f76ae13b4240dac304ed50636391d6b22e9c5.tar.xz linux-ea4f76ae13b4240dac304ed50636391d6b22e9c5.zip | |
[TCP]: Two fixes to new sacktag code
1) Skip condition used to be wrong way around which made SACK
processing very broken, missed many blocks because of that.
2) Use highest_sack advancement only if some skbs are already
sacked because otherwise tcp_write_queue_next may move things
too far (occurs mainly with GSO). The other similar advancement
is not problem because highest_sack was previosly put to point
a sacked skb.
These problems were located because of problem report from Matt
Mathis <mathis@psc.edu>.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 97ea3eda206d..33d284e3f7f5 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1384,7 +1384,7 @@ static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk, if (skb == tcp_send_head(sk)) break; - if (before(TCP_SKB_CB(skb)->end_seq, skip_to_seq)) + if (!before(TCP_SKB_CB(skb)->end_seq, skip_to_seq)) break; } return skb; @@ -1575,7 +1575,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ continue; } - if (!before(start_seq, tcp_highest_sack_seq(tp))) { + if (tp->sacked_out && !before(start_seq, tcp_highest_sack_seq(tp))) { skb = tcp_write_queue_next(sk, tp->highest_sack); fack_count = tp->fackets_out; } |