upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 062b42a..3ff2f59 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -445,6 +445,7 @@ void tcp_set_skb_tso_segs(struct sk_buff *skb, unsigned int mss_std)
                skb_shinfo(skb)->tso_size = mss_std;
        }
 }
+
 EXPORT_SYMBOL_GPL(tcp_set_skb_tso_segs);
 
 /* Function to create two new TCP segments.  Shrinks the given segment
@@ -779,6 +780,8 @@ int tcp_write_xmit(struct sock *sk, int nonagle)
        return 0;
 }
 
+EXPORT_SYMBOL_GPL(tcp_write_xmit);
+
 /* This function returns the amount that we can raise the
  * usable window based on the following constraints
  *  
@@ -1072,6 +1075,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
           (skb->next != sk->sk_send_head) &&
           (skb->next != (struct sk_buff *)&sk->sk_write_queue) &&
           (skb_shinfo(skb)->nr_frags == 0 && skb_shinfo(skb->next)->nr_frags == 0) &&
+          (tcp_skb_pcount(skb) == 1 && tcp_skb_pcount(skb->next) == 1) &&
           (sysctl_tcp_retrans_collapse != 0))
                tcp_retrans_try_collapse(sk, skb, cur_mss);
 
@@ -1107,6 +1111,8 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
                /* Update global TCP statistics. */
                TCP_INC_STATS(TCP_MIB_RETRANSSEGS);
 
+               tp->total_retrans++;
+
 #if FASTRETRANS_DEBUG > 0
                if (TCP_SKB_CB(skb)->sacked&TCPCB_SACKED_RETRANS) {
                        if (net_ratelimit())
@@ -1724,4 +1730,3 @@ EXPORT_SYMBOL(tcp_connect);
 EXPORT_SYMBOL(tcp_make_synack);
 EXPORT_SYMBOL(tcp_simple_retransmit);
 EXPORT_SYMBOL(tcp_sync_mss);
-EXPORT_SYMBOL_GPL(tcp_write_xmit);