From nobody Wed Sep 17 19:47:46 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F13F82BDC38; Thu, 31 Jul 2025 11:24:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753961067; cv=none; b=cTbY/iM9lTi+8wtEArW9gfrqVIvUIiu6YzlFYiSxOM/Xa2e/2tSjW8f7hQlZLDu34PEXuStBUgtGoa5eOSlVzLHL7B0lfci7ghI2ZnnldhOIO0MOoSHvnQZPs787PR4SdLuCQCVZKhR4Dvaa8g1EawPitQu4M/kojNyf0iMVb9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753961067; c=relaxed/simple; bh=qsuwWXAEWIUGdv6z5360HT5Jt2fvcIuLGXiOq1jBtO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cukG+URVUXTroY5hE42BfozZwxj2gwt/FsiOrVlYsyzHycJJzrCQkIDSMQpBU8V4+uLUfvHh+ipIbnpEar7ilqPThRQdXuYOedItMcOxt/LM8dicvKiM0+KtB991w/9iZIzWryRfSTk0tLux6ajIvLtlOVeP3VcadGvjKYPqK/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QFtD+14T; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QFtD+14T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C77AEC4CEF9; Thu, 31 Jul 2025 11:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753961066; bh=qsuwWXAEWIUGdv6z5360HT5Jt2fvcIuLGXiOq1jBtO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QFtD+14TaYHtUB6on4nPIafpHvUfUYluHdf/sgPNEQyFn9i1bHmV+Aj9VFvWZlFM3 WiU8m5wQRzzPhKzlnUHzvSaz8xe8yk8jzbJ/OUprIk+sJTqI8GSzZ5H2DBS5CjGOKx 1S6Mo41ETzSzxgQDBqFi9/GLiZasY4uIIBCwDGJk0Te+Fg8nY8WqvQp7dzi5xy6hwN bEK0VeRZw1UOjAWJEhwldTnElb8M2BZNC3GlP4VQdUY1q++1Y5qecTek2KEikOKLQV dz54v3HZhEKfxca1ScuCoy4obrF4z6u3o1KBmL2dRrqVVbknqwEVCwUATaaanQglfe DT7s8QF+wF8Jw== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: Geliang Tang , sashal@kernel.org, Matthieu Baerts , Mat Martineau , Jakub Kicinski , "Matthieu Baerts (NGI0)" Subject: [PATCH 5.15.y 5/6] mptcp: drop unused sk in mptcp_push_release Date: Thu, 31 Jul 2025 13:23:59 +0200 Message-ID: <20250731112353.2638719-13-matttbe@kernel.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250731112353.2638719-8-matttbe@kernel.org> References: <20250731112353.2638719-8-matttbe@kernel.org> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2226; i=matttbe@kernel.org; h=from:subject; bh=8BnuahpnPWZHdWUWpoSh5WXCdjsdDHoVpCUrBM9zpq4=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK6g0J3qOx/PuU4RxrPpOppx4x7/I2qln9OKplVovs7M vKsumV+RykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwERMjjAynFrk/faJtGF9ZNki /m0LnWc7Z155eE3gQMxS9ivO59xkShkZ3v9wtFzcXxO6grVq97ZJPjriJ9hPL/t4RnCWg/c0Z76 7DAA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang commit b8e0def397d7753206b1290e32f73b299a59984c upstream. Since mptcp_set_timeout() had removed from mptcp_push_release() in commit 33d41c9cd74c5 ("mptcp: more accurate timeout"), the argument sk in mptcp_push_release() became useless. Let's drop it. Fixes: 33d41c9cd74c5 ("mptcp: more accurate timeout") Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau Signed-off-by: Jakub Kicinski Stable-dep-of: c886d70286bf ("mptcp: do not queue data on closed subflows") Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c6a11d6df516..6e9d1a749950 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1568,8 +1568,7 @@ static struct sock *mptcp_subflow_get_send(struct mpt= cp_sock *msk) return NULL; } =20 -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); @@ -1626,7 +1625,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) * the last round, release prev_ssk */ if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(sk, prev_ssk, &info); + mptcp_push_release(prev_ssk, &info); if (!ssk) goto out; =20 @@ -1639,7 +1638,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) =20 ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); if (ret <=3D 0) { - mptcp_push_release(sk, ssk, &info); + mptcp_push_release(ssk, &info); goto out; } =20 @@ -1654,7 +1653,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) =20 /* 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); =20 out: /* ensure the rtx timer is running */ --=20 2.50.0