tcp: remove tp->lost_out guard to make joining diff nicer

[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 cfae61b40c449dbed068a8fcbba307596a50c63e..9f44be633ef645ac47dd72e1cf8abf61fd91ace9 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1992,6 +1992,33 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
        return err;
 }
 
+static int tcp_can_forward_retransmit(struct sock *sk)
+{
+       const struct inet_connection_sock *icsk = inet_csk(sk);
+       struct tcp_sock *tp = tcp_sk(sk);
+
+       /* Forward retransmissions are possible only during Recovery. */
+       if (icsk->icsk_ca_state != TCP_CA_Recovery)
+               return 0;
+
+       /* No forward retransmissions in Reno are possible. */
+       if (tcp_is_reno(tp))
+               return 0;
+
+       /* Yeah, we have to make difficult choice between forward transmission
+        * and retransmission... Both ways have their merits...
+        *
+        * For now we do not retransmit anything, while we have some new
+        * segments to send. In the other cases, follow rule 3 for
+        * NextSeg() specified in RFC3517.
+        */
+
+       if (tcp_may_send_now(sk))
+               return 0;
+
+       return 1;
+}
+
 /* This gets called after a retransmit timeout, and the initially
  * retransmitted data is acknowledged.  It tries to continue
  * resending the rest of the retransmit queue, until either
@@ -2005,6 +2032,10 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
        const struct inet_connection_sock *icsk = inet_csk(sk);
        struct tcp_sock *tp = tcp_sk(sk);
        struct sk_buff *skb;
+       int mib_idx;
+
+       if (!tp->lost_out)
+               tp->retransmit_high = tp->snd_una;
 
        if (tp->retransmit_skb_hint)
                skb = tp->retransmit_skb_hint;
@@ -2012,73 +2043,49 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
                skb = tcp_write_queue_head(sk);
 
        /* First pass: retransmit lost packets. */
-       if (tp->lost_out) {
-               tcp_for_write_queue_from(skb, sk) {
-                       __u8 sacked = TCP_SKB_CB(skb)->sacked;
+       tcp_for_write_queue_from(skb, sk) {
+               __u8 sacked = TCP_SKB_CB(skb)->sacked;
 
-                       if (skb == tcp_send_head(sk))
-                               break;
-                       /* we could do better than to assign each time */
-                       tp->retransmit_skb_hint = skb;
-
-                       /* Assume this retransmit will generate
-                        * only one packet for congestion window
-                        * calculation purposes.  This works because
-                        * tcp_retransmit_skb() will chop up the
-                        * packet to be MSS sized and all the
-                        * packet counting works out.
-                        */
-                       if (tcp_packets_in_flight(tp) >= tp->snd_cwnd)
-                               return;
-                       if (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high))
-                               break;
+               if (skb == tcp_send_head(sk))
+                       break;
+               /* we could do better than to assign each time */
+               tp->retransmit_skb_hint = skb;
+
+               /* Assume this retransmit will generate
+                * only one packet for congestion window
+                * calculation purposes.  This works because
+                * tcp_retransmit_skb() will chop up the
+                * packet to be MSS sized and all the
+                * packet counting works out.
+                */
+               if (tcp_packets_in_flight(tp) >= tp->snd_cwnd)
+                       return;
+               if (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high))
+                       break;
+               if (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))
+                       continue;
 
-                       if (sacked & TCPCB_LOST) {
-                               if (!(sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))) {
-                                       int mib_idx;
-
-                                       if (tcp_retransmit_skb(sk, skb)) {
-                                               tp->retransmit_skb_hint = NULL;
-                                               return;
-                                       }
-                                       if (icsk->icsk_ca_state != TCP_CA_Loss)
-                                               mib_idx = LINUX_MIB_TCPFASTRETRANS;
-                                       else
-                                               mib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;
-                                       NET_INC_STATS_BH(sock_net(sk), mib_idx);
-
-                                       if (skb == tcp_write_queue_head(sk))
-                                               inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
-                                                                         inet_csk(sk)->icsk_rto,
-                                                                         TCP_RTO_MAX);
-                               }
-                       }
+               if (!(sacked & TCPCB_LOST))
+                       continue;
+
+               if (tcp_retransmit_skb(sk, skb)) {
+                       tp->retransmit_skb_hint = NULL;
+                       return;
                }
+               if (icsk->icsk_ca_state != TCP_CA_Loss)
+                       mib_idx = LINUX_MIB_TCPFASTRETRANS;
+               else
+                       mib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;
+               NET_INC_STATS_BH(sock_net(sk), mib_idx);
+
+               if (skb == tcp_write_queue_head(sk))
+                       inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+                                                 inet_csk(sk)->icsk_rto,
+                                                 TCP_RTO_MAX);
        }
 
        /* OK, demanded retransmission is finished. */
-
-       /* Forward retransmissions are possible only during Recovery. */
-       if (icsk->icsk_ca_state != TCP_CA_Recovery)
-               return;
-
-       /* No forward retransmissions in Reno are possible. */
-       if (tcp_is_reno(tp))
-               return;
-
-       /* Yeah, we have to make difficult choice between forward transmission
-        * and retransmission... Both ways have their merits...
-        *
-        * For now we do not retransmit anything, while we have some new
-        * segments to send. In the other cases, follow rule 3 for
-        * NextSeg() specified in RFC3517.
-        */
-
-       if (tcp_may_send_now(sk))
-               return;
-
-       /* If nothing is SACKed, highest_sack in the loop won't be valid */
-       if (!tp->sacked_out)
+       if (!tcp_can_forward_retransmit(sk))
                return;
 
        if (tp->forward_skb_hint)