diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-11-15 19:43:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:54:05 -0800 |
| commit | b7d4815f35ab1d0f1eef2521a94a7d4c789290a2 (patch) | |
| tree | 1d8175fd4cb2c29d643c0f76d446fef04521c849 /net/ipv4/tcp_input.c | |
| parent | 9f58f3b721f52a4d3f497ea57f830ccd307f1d76 (diff) | |
| download | op-kernel-dev-b7d4815f35ab1d0f1eef2521a94a7d4c789290a2.zip op-kernel-dev-b7d4815f35ab1d0f1eef2521a94a7d4c789290a2.tar.gz | |
[TCP]: Prior_fackets can be replaced by highest_sack seq
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7a2bfd8..5e01ac2 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1251,7 +1251,6 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ struct sk_buff *cached_skb; int num_sacks = (ptr[1] - TCPOLEN_SACK_BASE)>>3; int reord = tp->packets_out; - int prior_fackets; int flag = 0; int found_dup_sack = 0; int cached_fack_count; @@ -1264,7 +1263,6 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ tp->fackets_out = 0; tp->highest_sack = tcp_write_queue_head(sk); } - prior_fackets = tp->fackets_out; found_dup_sack = tcp_check_dsack(tp, ack_skb, sp, num_sacks, prior_snd_una); @@ -1457,7 +1455,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ /* New sack for not retransmitted frame, * which was in hole. It is reordering. */ - if (fack_count < prior_fackets) + if (before(TCP_SKB_CB(skb)->seq, + tcp_highest_sack_seq(tp))) reord = min(fack_count, reord); /* SACK enhanced F-RTO (RFC4138; Appendix B) */ |
