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_output.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_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 8165f5aa8c71..11490958a096 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -750,7 +750,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
750 | 750 | ||
751 | BUG_ON(len > skb->len); | 751 | BUG_ON(len > skb->len); |
752 | 752 | ||
753 | tcp_clear_retrans_hints_partial(tp); | 753 | tcp_clear_all_retrans_hints(tp); |
754 | nsize = skb_headlen(skb) - len; | 754 | nsize = skb_headlen(skb) - len; |
755 | if (nsize < 0) | 755 | if (nsize < 0) |
756 | nsize = 0; | 756 | nsize = 0; |
@@ -1823,7 +1823,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, | |||
1823 | tp->packets_out -= tcp_skb_pcount(next_skb); | 1823 | tp->packets_out -= tcp_skb_pcount(next_skb); |
1824 | 1824 | ||
1825 | /* changed transmit queue under us so clear hints */ | 1825 | /* changed transmit queue under us so clear hints */ |
1826 | tcp_clear_retrans_hints_partial(tp); | 1826 | tcp_clear_all_retrans_hints(tp); |
1827 | 1827 | ||
1828 | sk_wmem_free_skb(sk, next_skb); | 1828 | sk_wmem_free_skb(sk, next_skb); |
1829 | } | 1829 | } |