From 34f69b2fa1298e8d4afb986d0768b058be1a9b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Sun, 7 Oct 2007 23:36:41 -0700 Subject: [PATCH] --- yaml --- r: 66935 b: refs/heads/master c: 29d0a309d11bac9e57af914d0d6a35cde0080861 h: refs/heads/master i: 66933: 4da6343305356f9dc8fa975366035b5203e875c9 66931: e169b063a4510761b5156d59759a951e1a110873 66927: 58f0d1a91608be95bea75f602e02b60e298da6ee v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4cc40271fc79..a9d35fb74ca9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 182f6ed5188ccb46d1c54c3334943a54110d0118 +refs/heads/master: 29d0a309d11bac9e57af914d0d6a35cde0080861 diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index 6199abeb0f5e..53296753b0bd 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -1755,14 +1755,16 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m if (tcp_is_reno(tp) && tp->sacked_out) tcp_dec_pcount_approx(&tp->sacked_out, next_skb); - tcp_adjust_fackets_out(tp, skb, tcp_skb_pcount(next_skb)); + tcp_adjust_fackets_out(tp, next_skb, tcp_skb_pcount(next_skb)); tp->packets_out -= tcp_skb_pcount(next_skb); /* changed transmit queue under us so clear hints */ tcp_clear_retrans_hints_partial(tp); /* manually tune sacktag skb hint */ - if (tp->fastpath_skb_hint == next_skb) + if (tp->fastpath_skb_hint == next_skb) { tp->fastpath_skb_hint = skb; + tp->fastpath_cnt_hint -= tcp_skb_pcount(skb); + } sk_stream_free_skb(sk, next_skb); }