X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=net%2Fipv4%2Ftcp_output.c;h=376b2cfbb685f78fb32d61823f0d4252729b6156;hb=8781342df72fcc37f2aebd43d3a293b0a343806d;hp=364784a91939c50eff90f8d8f29a174e1f63bafe;hpb=39f86a608a3e0f0164bd1540acf87696cfdfb5bb;p=cascardo%2Flinux.git diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 364784a91939..376b2cfbb685 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2060,7 +2060,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to, /* Punt if not enough space exists in the first SKB for * the data in the second */ - if (skb->len > skb_tailroom(to)) + if (skb->len > skb_availroom(to)) break; if (after(TCP_SKB_CB(skb)->end_seq, tcp_wnd_end(tp)))