Re: [PATCH next mptcp-next] mptcp: pm: userspace: make remove_addr_entry static

Hi Matt,

On Fri, 2026-08-07 at 12:51 +0200, Matthieu Baerts (NGI0) wrote:
> Only used in pm_userspace.c.
> 
> While at it, use the mptcp_userspace_pm_ prefix, like most functions
> in
> this file: that makes it clear it is specific to this userspace PM.

Looks good!

    Reviewed-by: Geliang Tang <[email protected]>

Thanks,
-Geliang

> 
> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
> ---
>  net/mptcp/pm_userspace.c | 7 ++++---
>  net/mptcp/protocol.h     | 2 --
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
> index 8537fd75f73f..f723a134356f 100644
> --- a/net/mptcp/pm_userspace.c
> +++ b/net/mptcp/pm_userspace.c
> @@ -291,8 +291,9 @@ static int
> mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk)
>  	return err;
>  }
>  
> -void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
> -				struct mptcp_pm_addr_entry *entry)
> +static void
> +mptcp_userspace_pm_remove_addr_entry(struct mptcp_sock *msk,
> +				     struct mptcp_pm_addr_entry
> *entry)
>  {
>  	struct mptcp_rm_list alist = { .nr = 0 };
>  	int anno_nr = 0;
> @@ -350,7 +351,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb,
> struct genl_info *info)
>  	list_del_rcu(&match->list);
>  	spin_unlock_bh(&msk->pm.lock);
>  
> -	mptcp_pm_remove_addr_entry(msk, match);
> +	mptcp_userspace_pm_remove_addr_entry(msk, match);
>  
>  	release_sock(sk);
>  
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 2f5b2f671c44..70200e75facf 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -1149,8 +1149,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock
> *msk,
>  			   const struct mptcp_addr_info *addr,
>  			   bool echo);
>  int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct
> mptcp_rm_list *rm_list);
> -void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,
> -				struct mptcp_pm_addr_entry *entry);
>  
>  /* the default path manager, used in mptcp_pm_unregister */
>  extern struct mptcp_pm_ops mptcp_pm_kernel;
> 
> ---
> base-commit: f393de6a43c333c11fbecdd76fa4fa3cc06aa834
> change-id: 20260807-mptcp-pm-user-remove_addr_entry-bcf1a456d0f8
> 
> Best regards,
> --  
> Matthieu Baerts (NGI0) <[email protected]>
>