mptcp: pm: rename add_entry structure to add_addr

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 <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260605-net-next-mptcp-add-addr6-port-ts-v2-10-758e7ca73f4d@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 09fb64954351ff56104766aad56a162c7997d184..cd26505cf41e13e8f147ad412dce6a6edde395bf 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -12,7 +12,7 @@
 
 #define ADD_ADDR_RETRANS_MAX   3
 
-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_sock *msk,
        return false;
 }
 
-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;
 
        lockdep_assert_held(&msk->pm.lock);
 
@@ -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;
 
        entry = mptcp_pm_del_add_timer(msk, addr, false);
@@ -164,7 +164,7 @@ bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock *msk,
 
 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 = false;
 
@@ -340,8 +340,8 @@ static unsigned int mptcp_adjust_add_addr_timeout(struct mptcp_sock *msk)
 
 static void mptcp_pm_add_timer(struct timer_list *timer)
 {
-       struct mptcp_pm_add_entry *entry = timer_container_of(entry, timer,
-                                                             add_timer);
+       struct mptcp_pm_add_addr *entry = timer_container_of(entry, timer,
+                                                            add_timer);
        struct mptcp_sock *msk = entry->sock;
        struct sock *sk = (struct sock *)msk;
        unsigned int timeout = 0;
@@ -397,12 +397,12 @@ out:
        sock_put(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)
 {
-       struct mptcp_pm_add_entry *entry;
        struct sock *sk = (struct sock *)msk;
+       struct mptcp_pm_add_addr *entry;
        bool stop_timer = false;
 
        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 = NULL;
+       struct mptcp_pm_add_addr *add_entry = NULL;
        struct sock *sk = (struct sock *)msk;
        unsigned int timeout;
 
@@ -471,7 +471,7 @@ reset_timer:
 
 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 = (struct sock *)msk;
        LIST_HEAD(free_list);
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 62d37d5c63f4d961a68c408919cf38ccc6e87ff7..f3c2ab71737e248f63dd9d86e925b47fd8b04edd 100644 (file)
--- 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,