Commit 0522b424 authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: add do_check_data_fin to replace copied 



This patch adds a new bool variable 'do_check_data_fin' to replace the
original int variable 'copied' in __mptcp_push_pending(), check it to
determine whether to call __mptcp_check_send_data_fin().

Suggested-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent a1c3bdd9

net/mptcp/protocol.c

+4 −3
Original line number Diff line number Diff line
@@ -1538,8 +1538,9 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 
	struct mptcp_sendmsg_info info = {

				.flags = flags,

	};

	bool do_check_data_fin = false;

	struct mptcp_data_frag *dfrag;

	int len, copied = 0;

	int len;



	while ((dfrag = mptcp_send_head(sk))) {

		info.sent = dfrag->already_sent;
@@ -1574,8 +1575,8 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 
				goto out;

			}



			do_check_data_fin = true;

			info.sent += ret;

			copied += ret;

			len -= ret;



			mptcp_update_post_push(msk, dfrag, ret);
@@ -1591,7 +1592,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 
	/* ensure the rtx timer is running */

	if (!mptcp_timer_pending(sk))

		mptcp_reset_timer(sk);

	if (copied)

	if (do_check_data_fin)

		__mptcp_check_send_data_fin(sk);

}