Commit bd446314 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27728ba8

net/ipv4/tcp_output.c

+3 −7
Original line number Diff line number Diff line
@@ -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))

	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. */