diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2009-02-27 23:44:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-02 06:00:10 -0500 |
commit | d3d2ae454501a4dec360995649e1b002a2ad90c5 (patch) | |
tree | 7177d441defb9f3293ad83f71a57081a7c62962b /net | |
parent | 62ad27619cbcf23fb8581ae72f3806c1d90a861d (diff) |
tcp: Don't clear hints when tcp_fragmenting
1) We didn't remove any skbs, so no need to handle stale refs.
2) scoreboard_skb_hint is trivial, no timestamps were changed
so no need to clear that one
3) lost_skb_hint needs tweaking similar to that of
tcp_sacktag_one().
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_output.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index fa3c81aa4e6a..3feab4d6929d 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -771,7 +771,6 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
771 | 771 | ||
772 | BUG_ON(len > skb->len); | 772 | BUG_ON(len > skb->len); |
773 | 773 | ||
774 | tcp_clear_retrans_hints_partial(tp); | ||
775 | nsize = skb_headlen(skb) - len; | 774 | nsize = skb_headlen(skb) - len; |
776 | if (nsize < 0) | 775 | if (nsize < 0) |
777 | nsize = 0; | 776 | nsize = 0; |
@@ -854,6 +853,12 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
854 | tcp_verify_left_out(tp); | 853 | tcp_verify_left_out(tp); |
855 | } | 854 | } |
856 | tcp_adjust_fackets_out(sk, skb, diff); | 855 | tcp_adjust_fackets_out(sk, skb, diff); |
856 | |||
857 | if (tp->lost_skb_hint && | ||
858 | before(TCP_SKB_CB(skb)->seq, | ||
859 | TCP_SKB_CB(tp->lost_skb_hint)->seq) && | ||
860 | (tcp_is_fack(tp) || TCP_SKB_CB(skb)->sacked)) | ||
861 | tp->lost_cnt_hint -= diff; | ||
857 | } | 862 | } |
858 | 863 | ||
859 | /* Link BUFF into the send queue. */ | 864 | /* Link BUFF into the send queue. */ |