Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tcp: allow segment with FIN in tcp_try_coalesce() 



We can allow a segment with FIN to be aggregated,
if we take care to add tcp flags,
and if skb_try_coalesce() takes care of zero sized skbs.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e11ecddf

net/core/skbuff.c

+2 −1
Original line number Diff line number Diff line
@@ -3936,6 +3936,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, 
		return false;



	if (len <= skb_tailroom(to)) {

		if (len)

			BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));

		*delta_truesize = 0;

		return true;

net/ipv4/tcp_input.c

+1 −3
Original line number Diff line number Diff line
@@ -4143,9 +4143,6 @@ static bool tcp_try_coalesce(struct sock *sk, 


	*fragstolen = false;



	if (tcp_hdr(from)->fin)

		return false;



	/* Its possible this segment overlaps with prior segment in queue */

	if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)

		return false;
@@ -4158,6 +4155,7 @@ static bool tcp_try_coalesce(struct sock *sk, 
	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRCVCOALESCE);

	TCP_SKB_CB(to)->end_seq = TCP_SKB_CB(from)->end_seq;

	TCP_SKB_CB(to)->ack_seq = TCP_SKB_CB(from)->ack_seq;

	TCP_SKB_CB(to)->tcp_flags |= TCP_SKB_CB(from)->tcp_flags;

	return true;

}