Commit b8e0def3 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: drop unused sk in mptcp_push_release 



Since mptcp_set_timeout() had removed from mptcp_push_release() in
commit 33d41c9c ("mptcp: more accurate timeout"), the argument
sk in mptcp_push_release() became useless. Let's drop it.

Fixes: 33d41c9c ("mptcp: more accurate timeout")
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6511882c

net/mptcp/protocol.c

+4 −5
Original line number Diff line number Diff line
@@ -1469,8 +1469,7 @@ static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) 
	return NULL;

}



static void mptcp_push_release(struct sock *sk, struct sock *ssk,

			       struct mptcp_sendmsg_info *info)

static void mptcp_push_release(struct sock *ssk, struct mptcp_sendmsg_info *info)

{

	tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle, info->size_goal);

	release_sock(ssk);
@@ -1533,7 +1532,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 
			 * the last round, release prev_ssk

			 */

			if (ssk != prev_ssk && prev_ssk)

				mptcp_push_release(sk, prev_ssk, &info);

				mptcp_push_release(prev_ssk, &info);

			if (!ssk)

				goto out;
@@ -1546,7 +1545,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 


			ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);

			if (ret <= 0) {

				mptcp_push_release(sk, ssk, &info);

				mptcp_push_release(ssk, &info);

				goto out;

			}
@@ -1561,7 +1560,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 


	/* at this point we held the socket lock for the last subflow we used */

	if (ssk)

		mptcp_push_release(sk, ssk, &info);

		mptcp_push_release(ssk, &info);



out:

	/* ensure the rtx timer is running */