mptcp: pm: drop match in userspace_pm_append_new_local_addr

The variable 'match' in mptcp_userspace_pm_append_new_local_addr() is a
redundant one, and this patch drops it.

No need to define 'match' as 'struct mptcp_pm_addr_entry *' type. In this
function, it's only used to check whether it's NULL. It can be defined as
a Boolean one.

Also other variables 'addr_match' and 'id_match' make 'match' a redundant
one, which can be replaced by directly checking 'addr_match && id_match'.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250221-net-next-mptcp-pm-misc-cleanup-3-v1-5-2b70ab1cee79@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index bedd6f9ebc8b07871d317dfaf65135342cdeeeee..a16e2fb45a6c68bc0c3c187122a54765ef0fb259 100644 (file)
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -48,7 +48,6 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
                                                    bool needs_id)
 {
        DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
-       struct mptcp_pm_addr_entry *match = NULL;
        struct sock *sk = (struct sock *)msk;
        struct mptcp_pm_addr_entry *e;
        bool addr_match = false;
@@ -63,16 +62,12 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
                if (addr_match && entry->addr.id == 0 && needs_id)
                        entry->addr.id = e->addr.id;
                id_match = (e->addr.id == entry->addr.id);
-               if (addr_match && id_match) {
-                       match = e;
+               if (addr_match || id_match)
                        break;
-               } else if (addr_match || id_match) {
-                       break;
-               }
                __set_bit(e->addr.id, id_bitmap);
        }
 
-       if (!match && !addr_match && !id_match) {
+       if (!addr_match && !id_match) {
                /* Memory for the entry is allocated from the
                 * sock option buffer.
                 */
@@ -90,7 +85,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
                list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list);
                msk->pm.local_addr_used++;
                ret = e->addr.id;
-       } else if (match) {
+       } else if (addr_match && id_match) {
                ret = entry->addr.id;
        }