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

!8375 [sync] PR-8306: mptcp: ensure tx skbs always have the MPTCP ext 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8306 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3VUBXULVB7ADMQX2BUFOPABD3VUOR6ST/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4NZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/8375

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 15f82233 b6c9c646

net/mptcp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 
		 * queue management operation, to avoid breaking the ext <->

		 * SSN association set here

		 */

		can_collapse = (size_goal - skb->len > 0) &&

		can_collapse = (size_goal > skb->len) &&

			      mptcp_skb_can_collapse_to(*write_seq, skb, mpext);

		if (!can_collapse)

			TCP_SKB_CB(skb)->eor = 1;