tcp: back retransmit_high when it over-estimated

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index b5b4ddcdda4167309fcc020e7b22f07142a7f21b..8f9793a37b618540d27ec965b5489a3d1ff7a171 100644 (file)
--- 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,
 
        BUG_ON(len > skb->len);
 
-       tcp_clear_all_retrans_hints(tp);
+       tcp_clear_retrans_hints_partial(tp);
        nsize = skb_headlen(skb) - len;
        if (nsize < 0)
                nsize = 0;
@@ -1823,7 +1823,9 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb,
        tp->packets_out -= tcp_skb_pcount(next_skb);
 
        /* changed transmit queue under us so clear hints */
-       tcp_clear_all_retrans_hints(tp);
+       tcp_clear_retrans_hints_partial(tp);
+       if (next_skb == tp->retransmit_skb_hint)
+               tp->retransmit_skb_hint = skb;
 
        sk_wmem_free_skb(sk, next_skb);
 }
@@ -1853,7 +1855,7 @@ void tcp_simple_retransmit(struct sock *sk)
                }
        }
 
-       tcp_clear_all_retrans_hints(tp);
+       tcp_clear_retrans_hints_partial(tp);
 
        if (prior_lost == tp->lost_out)
                return;
@@ -2033,16 +2035,22 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
        struct tcp_sock *tp = tcp_sk(sk);
        struct sk_buff *skb;
        struct sk_buff *hole = NULL;
+       u32 last_lost;
        int mib_idx;
        int fwd_rexmitting = 0;
 
        if (!tp->lost_out)
                tp->retransmit_high = tp->snd_una;
 
-       if (tp->retransmit_skb_hint)
+       if (tp->retransmit_skb_hint) {
                skb = tp->retransmit_skb_hint;
-       else
+               last_lost = TCP_SKB_CB(skb)->end_seq;
+               if (after(last_lost, tp->retransmit_high))
+                       last_lost = tp->retransmit_high;
+       } else {
                skb = tcp_write_queue_head(sk);
+               last_lost = tp->snd_una;
+       }
 
        /* First pass: retransmit lost packets. */
        tcp_for_write_queue_from(skb, sk) {
@@ -2071,6 +2079,7 @@ begin_fwd:
                        mib_idx = LINUX_MIB_TCPFORWARDRETRANS;
 
                } else if (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high)) {
+                       tp->retransmit_high = last_lost;
                        if (!tcp_can_forward_retransmit(sk))
                                break;
                        /* Backtrack if necessary to non-L'ed skb */
@@ -2087,6 +2096,7 @@ begin_fwd:
                        continue;
 
                } else {
+                       last_lost = TCP_SKB_CB(skb)->end_seq;
                        if (icsk->icsk_ca_state != TCP_CA_Loss)
                                mib_idx = LINUX_MIB_TCPFASTRETRANS;
                        else
@@ -2096,10 +2106,8 @@ begin_fwd:
                if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
                        continue;
 
-               if (tcp_retransmit_skb(sk, skb)) {
-                       tp->retransmit_skb_hint = NULL;
+               if (tcp_retransmit_skb(sk, skb))
                        return;
-               }
                NET_INC_STATS_BH(sock_net(sk), mib_idx);
 
                if (skb == tcp_write_queue_head(sk))