tcp: remove dead code from tcp_collapse_retrans()

TCP sendmsg() no longer puts payload in skb->head,
remove some dead code from tcp_collapse_retrans().

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index c0c55a8be8f79857e176714f240fddcb0580fa6b..e1dcc93d5b6daf34e41817658c4f2029d429e82b 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3045,13 +3045,9 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb)
 
        BUG_ON(tcp_skb_pcount(skb) != 1 || tcp_skb_pcount(next_skb) != 1);
 
-       if (next_skb_size) {
-               if (next_skb_size <= skb_availroom(skb))
-                       skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size),
-                                     next_skb_size);
-               else if (!tcp_skb_shift(skb, next_skb, 1, next_skb_size))
-                       return false;
-       }
+       if (next_skb_size && !tcp_skb_shift(skb, next_skb, 1, next_skb_size))
+               return false;
+
        tcp_highest_sack_replace(sk, next_skb, skb);
 
        /* Update sequence range on original skb. */