diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-09-21 00:18:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-21 00:18:32 -0400 |
commit | 64edc2736e23994e0334b70c5ff08dc33e2ebbd9 (patch) | |
tree | 2ce61d4894023389258db20edc30ce7d7863d6be /net/ipv4/tcp_input.c | |
parent | d950f264ff7260d8c1e124158d758db13e1ad2d0 (diff) |
tcp: Partial hint clearing has again become meaningless
Ie., the difference between partial and all clearing doesn't
exists anymore since the SACK optimizations got dropped by
an sacktag rewrite.
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 f79a51607292..7306bfb16cdb 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1883,7 +1883,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) | |||
1883 | tp->high_seq = tp->snd_nxt; | 1883 | tp->high_seq = tp->snd_nxt; |
1884 | TCP_ECN_queue_cwr(tp); | 1884 | TCP_ECN_queue_cwr(tp); |
1885 | 1885 | ||
1886 | tcp_clear_retrans_hints_partial(tp); | 1886 | tcp_clear_all_retrans_hints(tp); |
1887 | } | 1887 | } |
1888 | 1888 | ||
1889 | static void tcp_clear_retrans_partial(struct tcp_sock *tp) | 1889 | static void tcp_clear_retrans_partial(struct tcp_sock *tp) |
@@ -1934,12 +1934,11 @@ void tcp_enter_loss(struct sock *sk, int how) | |||
1934 | /* Push undo marker, if it was plain RTO and nothing | 1934 | /* Push undo marker, if it was plain RTO and nothing |
1935 | * was retransmitted. */ | 1935 | * was retransmitted. */ |
1936 | tp->undo_marker = tp->snd_una; | 1936 | tp->undo_marker = tp->snd_una; |
1937 | tcp_clear_retrans_hints_partial(tp); | ||
1938 | } else { | 1937 | } else { |
1939 | tp->sacked_out = 0; | 1938 | tp->sacked_out = 0; |
1940 | tp->fackets_out = 0; | 1939 | tp->fackets_out = 0; |
1941 | tcp_clear_all_retrans_hints(tp); | ||
1942 | } | 1940 | } |
1941 | tcp_clear_all_retrans_hints(tp); | ||
1943 | 1942 | ||
1944 | tcp_for_write_queue(skb, sk) { | 1943 | tcp_for_write_queue(skb, sk) { |
1945 | if (skb == tcp_send_head(sk)) | 1944 | if (skb == tcp_send_head(sk)) |