From nobody Tue Aug 25 02:44:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 AC1664C901B; Fri, 5 Jun 2026 09:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780651356; cv=none; b=UI0nQ3XdzY7gKih7DkbC54uIemW6GSkc04sawTs2RLvhujCYV6rm6KhQrn7cwwomWGG42/LVI2weAqfL4PsCRI87+jTt5ryM49J5F07AB2F5UtYpVxWew76p/e6PR2ABCZPocEUZg+RSmcNP0RBNgmBuLdfesJJLUwdYwSo8UpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780651356; c=relaxed/simple; bh=9181yk0ayuMVbgJ69zukIsGR51jBPbyOjkhivphxgxs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P4bcXkZ2MMJuSHmuB3flV721STrJiFFRiuljTJm04KkTqT67dlYlc6PHx+0QYcSanu6MdmsA58mrosXC2PtHb8xWmHQFexJvuaz8Eej804hli7/7OegeLI56AIX/Ua9StknFd2NYPTVJ2O4FW4qUWuG3SugZ5mw4B/8i8BtEofI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i1Rik7rL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i1Rik7rL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEEDC1F00898; Fri, 5 Jun 2026 09:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780651355; bh=Bh9Fy5epNwKTbczwKcjUFpXak+cZttJmj6KWR8ggP3s=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=i1Rik7rLC/fgk3Au1w5/suwtBeXo2HXnw3vwZpXAFXJCLBop+9EEqAApzUCqwiLXv 2dw/Grzq3ALNxg2uuk0wYZBxOUzPCy4O8ms7m6XasqgXEuazrk0t7G0l3z+N1zoR6l OFHCOGuLq+C5SmD7YiUuXPzrAADeuCkwRLr9VPpEL9N8iQvzidPkLMIcZv6Z890zXE QFmOiSzSKXgFhj0vDThsyCoZxxNAlGIuwmdwrnM4er8MQ8WW4ep7p3HoU48HBrwBo4 d6SLfgDKIZo0KxOMHqKmrSPO1p8mRvztO9sdLTSmNMY9uh6z1XqeF4bKB+iGAH+UIJ MuutVWj+xtFPw== From: "Matthieu Baerts (NGI0)" Date: Fri, 05 Jun 2026 19:21:54 +1000 Subject: [PATCH net-next v2 10/15] mptcp: pm: rename add_entry structure to add_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: <20260605-net-next-mptcp-add-addr6-port-ts-v2-10-758e7ca73f4d@kernel.org> References: <20260605-net-next-mptcp-add-addr6-port-ts-v2-0-758e7ca73f4d@kernel.org> In-Reply-To: <20260605-net-next-mptcp-add-addr6-port-ts-v2-0-758e7ca73f4d@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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4014; i=matttbe@kernel.org; h=from:subject:message-id; bh=9181yk0ayuMVbgJ69zukIsGR51jBPbyOjkhivphxgxs=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBqIpUx/QSRwSSrNVj/y933e3BF2zdT39fmUplBn liHmCQcIreJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCaiKVMQAKCRD2t4JPQmmg c3adD/9HJ6GWp7xYY7utb53tTRxOOfQDX6spAFjHoJXTQFmPThuwbtABpQxD87XL3bgulVlMxov q6RIs8hsJVHeuvps2W/9GMWyBaHvXZsZr2IHoXQA1gxAFEU/kMokr8qZMWazJcTZYxVCQq0+L8v D3wDVaziobHlx8LDBdROaOBtmuXc244XvFSyVzH7n+0+z6olS2CjT8OQx9StDJZdupnsyQGsasm T/7k51ezdfS277uotIjI8AzpUZUh301dkGezz3i2+QBDwU3cCwWta3c+U6n3/OLZAHByS4xWC7I Tcmkt2LsbEbdI9fv+3h1aL6WwuVt74y0+A3Ao89U8yJnpAFscK1Gx2luWL95fRRf9ea/AzSjEke 79hCzmIFZvZXaQeOf7bcoi2gzxNLwGXRdba0qrlfFmQUIl7PklKnWBL5bxrCDzzLdnuflDS2+U0 EK/tJb3vE8YotvOMb9OvO50XUGLYLhxcyTchZjj/DnvUVZ8aLypkqy1x7KQ3YS9KW9NCxi2tCaZ K7faX4NyoyrtKgWNKN5cnL8UwKf2Eitr6d2qfYf8m4uLXSITC+ZoTqj5VqW5FFTXfMD77FyWBY1 0W/vTz6kf+XE/69TSouKiMql+rQEDTaxCBjS58gn9ZodSLyEyUTgI29bp7zjd77qlpnMC2R1z8f UT2c/PUmvcO6Iow== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Using only the 'add' prefix is confusing: does it refer to a generic added entry or address, or specifically to ADD_ADDRs. Using add_addr removes this confusion. Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm.c | 22 +++++++++++----------- net/mptcp/protocol.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 09fb64954351..cd26505cf41e 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -12,7 +12,7 @@ =20 #define ADD_ADDR_RETRANS_MAX 3 =20 -struct mptcp_pm_add_entry { +struct mptcp_pm_add_addr { struct list_head list; struct mptcp_addr_info addr; u8 retrans_times; @@ -133,11 +133,11 @@ bool mptcp_pm_has_subflow_saddr(const struct mptcp_so= ck *msk, return false; } =20 -static struct mptcp_pm_add_entry * +static struct mptcp_pm_add_addr * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, const struct mptcp_addr_info *addr) { - struct mptcp_pm_add_entry *entry; + struct mptcp_pm_add_addr *entry; =20 lockdep_assert_held(&msk->pm.lock); =20 @@ -152,7 +152,7 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock= *msk, bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr) { - struct mptcp_pm_add_entry *entry; + struct mptcp_pm_add_addr *entry; bool ret; =20 entry =3D mptcp_pm_del_add_timer(msk, addr, false); @@ -164,7 +164,7 @@ bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock = *msk, =20 bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk) { - struct mptcp_pm_add_entry *entry; + struct mptcp_pm_add_addr *entry; struct mptcp_addr_info saddr; bool ret =3D false; =20 @@ -340,8 +340,8 @@ static unsigned int mptcp_adjust_add_addr_timeout(struc= t mptcp_sock *msk) =20 static void mptcp_pm_add_timer(struct timer_list *timer) { - struct mptcp_pm_add_entry *entry =3D timer_container_of(entry, timer, - add_timer); + struct mptcp_pm_add_addr *entry =3D timer_container_of(entry, timer, + add_timer); struct mptcp_sock *msk =3D entry->sock; struct sock *sk =3D (struct sock *)msk; unsigned int timeout =3D 0; @@ -397,12 +397,12 @@ static void mptcp_pm_add_timer(struct timer_list *tim= er) sock_put(sk); } =20 -struct mptcp_pm_add_entry * +struct mptcp_pm_add_addr * mptcp_pm_del_add_timer(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool check_id) { - struct mptcp_pm_add_entry *entry; struct sock *sk =3D (struct sock *)msk; + struct mptcp_pm_add_addr *entry; bool stop_timer =3D false; =20 rcu_read_lock(); @@ -434,7 +434,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, const struct mptcp_addr_info *addr) { - struct mptcp_pm_add_entry *add_entry =3D NULL; + struct mptcp_pm_add_addr *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; unsigned int timeout; =20 @@ -471,7 +471,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 static void mptcp_pm_free_anno_list(struct mptcp_sock *msk) { - struct mptcp_pm_add_entry *entry, *tmp; + struct mptcp_pm_add_addr *entry, *tmp; struct sock *sk =3D (struct sock *)msk; LIST_HEAD(free_list); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 62d37d5c63f4..f3c2ab71737e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1133,7 +1133,7 @@ int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk, bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, const struct mptcp_addr_info *addr); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); -struct mptcp_pm_add_entry * +struct mptcp_pm_add_addr * mptcp_pm_del_add_timer(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool check_id); bool mptcp_pm_has_subflow_saddr(const struct mptcp_sock *msk, --=20 2.53.0