Unverified Commit ff5f723b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12933 tcp: fix mptcp DSS corruption due to large pmtu xmit 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2HDWEGY75U37DIGR5XIJNQLH6KLDTDXK/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB0ENM 
 
Link:https://gitee.com/openeuler/kernel/pulls/12933

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 5a35d512 d0c742c4

net/ipv4/tcp_output.c

+1 −3
Original line number Diff line number Diff line
@@ -2366,9 +2366,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len) 
		if (len <= skb->len)

			break;



		if (unlikely(TCP_SKB_CB(skb)->eor) ||

		    tcp_has_tx_tstamp(skb) ||

		    !skb_pure_zcopy_same(skb, next))

		if (tcp_has_tx_tstamp(skb) || !tcp_skb_can_collapse(skb, next))

			return false;



		len -= skb->len;