From nobody Mon Feb 9 16:35:27 2026 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 061892EF652; Thu, 5 Feb 2026 17:34:35 +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=1770312876; cv=none; b=D1wN99lCjzR7doNwJff+BlhNBlyPdI00ROL+LqPbQhi1y0JLA6L7m7gE2ZXLI7/bhj+7MQ8sPsEy0U+YHWHx+pbS7wtVsBOQHYUBMYz0IMNdqEhhYcTeRPBdHQJZ0ddb5lmghGs93SAbqdpOz5sm8RF8tQJh8neKSce93+FwoYE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770312876; c=relaxed/simple; bh=k86znqb/C5wurGTotFhvFsMFzCbZUfP3RFI0jLbub1Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b6mYBhpzn2tdY0v4XSZLfAKvK9jsZPgO2qRJJohwhWMViWQTKY7wXT6LsBKI7mWFZvG4DrnNxusRp7lLfu5B3W86B6Eac4zZxzgpdDjuRly/M3iWa7LShcL/T+t1PK4F4K71uiws8HyvYhIhS/7ZeCj8vmnF9XXh+VVrAozgei0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HDS4RBq+; 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="HDS4RBq+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBC2AC4CEF7; Thu, 5 Feb 2026 17:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770312875; bh=k86znqb/C5wurGTotFhvFsMFzCbZUfP3RFI0jLbub1Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HDS4RBq+NyGOF2rklLqTESSWlozTjwMuWpUs0mKMd3j2vxDo7seB+hJwJV0vJToOJ ARM6dbQI+bN19e2xrSfPwly4H61m6sV7JHtEhrazpfonZCQdnmjQkWTs8MD3MVOT96 RXZuVCADdtW57jWadEdP94tyMAlZFkmtpE8wkUX/tE5pJbIxLDrCTJ08SHZCUz2UEH vKANU3Sr/4q5bcUDjPVXjGawx2Yo91P6XkYKEw4CWe9WPLB38tlo2T9v5DP1zF6whX KUgkSlWAVtOf/F42ODsvHxs0kVPfzH/iapy/XKBOruA2RYKfVFsld4XJtFgL6ZvYa6 qI2Dtacvdf45g== From: "Matthieu Baerts (NGI0)" Date: Thu, 05 Feb 2026 18:34:22 +0100 Subject: [PATCH net v2 2/4] mptcp: pm: in-kernel: clarify mptcp_pm_remove_anno_addr() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260205-net-mptcp-misc-fixes-6-19-rc8-v2-2-c2720ce75c34@kernel.org> References: <20260205-net-mptcp-misc-fixes-6-19-rc8-v2-0-c2720ce75c34@kernel.org> In-Reply-To: <20260205-net-mptcp-misc-fixes-6-19-rc8-v2-0-c2720ce75c34@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1636; i=matttbe@kernel.org; h=from:subject:message-id; bh=k86znqb/C5wurGTotFhvFsMFzCbZUfP3RFI0jLbub1Y=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJbriy6JhS8oTXPNNDY/8+h+wVLPM4WNCt2yq54fSREK vQyU4FjRykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwEQuX2Rk+BSisubxP9/vKRJp G/gO6AroP3v/6ue+X/+d1nWsel6YfJzhf4B0XMYecZ+cHVy9ug3yoUltr/8yql4R73XWaPxad1C QDwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The variable 'ret' was used, but it was not cleared what it was, and probably led to an issue [1]. Rename it to 'announced' to avoid confusions. While at it, remove the returned value of the helper: it is only used in one place, and the returned value is not used. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/606 [1] Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_kernel.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index 4972c19fc73e..b5316a6c7d1b 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1044,24 +1044,23 @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, = struct genl_info *info) return ret; } =20 -static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, +static void mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool force) { struct mptcp_rm_list list =3D { .nr =3D 0 }; - bool ret; + bool announced; =20 list.ids[list.nr++] =3D mptcp_endp_get_local_id(msk, addr); =20 - ret =3D mptcp_remove_anno_list_by_saddr(msk, addr); - if (ret || force) { + announced =3D mptcp_remove_anno_list_by_saddr(msk, addr); + if (announced || force) { spin_lock_bh(&msk->pm.lock); - if (ret) + if (announced) msk->pm.add_addr_signaled--; mptcp_pm_remove_addr(msk, &list); spin_unlock_bh(&msk->pm.lock); } - return ret; } =20 static void __mark_subflow_endp_available(struct mptcp_sock *msk, u8 id) --=20 2.51.0