From f6ea96328655d8d1c1f783847f0ffafb8c6079ca Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 23 Sep 2008 01:29:23 -0700 Subject: [PATCH] --- yaml --- r: 111799 b: refs/heads/master c: 77d40a0952b16e020ce07c4cf9fb22024448275b h: refs/heads/master i: 111797: 0fef4ee8e6d61050c7b852be091879b66a525a29 111795: 062341758a8dcb1e2e848ff922fce91f88d72ae6 111791: 3e563a465e3fd44c9d36f1fbceef0695e2d7552c v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ea56bbc57847..9cfbacda00fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38ce7c736916293b7ce09cd6a2133894fe2cec52 +refs/heads/master: 77d40a0952b16e020ce07c4cf9fb22024448275b diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index c3d58ee3e16f..a8499ef3234a 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -1932,8 +1932,8 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) /* Collapse two adjacent packets if worthwhile and we can. */ if (!(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_SYN) && (skb->len < (cur_mss >> 1)) && - (tcp_write_queue_next(sk, skb) != tcp_send_head(sk)) && (!tcp_skb_is_last(sk, skb)) && + (tcp_write_queue_next(sk, skb) != tcp_send_head(sk)) && (skb_shinfo(skb)->nr_frags == 0 && skb_shinfo(tcp_write_queue_next(sk, skb))->nr_frags == 0) && (tcp_skb_pcount(skb) == 1 &&