[PATCH net-next 01/11] mptcp: pm: rename helpers linked to 'flush'

[Matthieu Baerts (NGI0)]

Rename all the helpers specific to the flushing operations to make it
clear that the intention is to flush all created subflows, and remove
all announced addresses, not just a specific selection.

That way, it is easier to understand why the id_avail_bitmap and
local_addr_used are reset at the end.

Reviewed-by: Mat Martineau <martin...@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matt...@kernel.org>
---
 net/mptcp/pm_netlink.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index f891bc714668..275959581586 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1672,8 +1672,8 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct 
list_head *rm_list)
 }
 
 /* Called from the in-kernel PM only */
-static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk,
-                                              struct list_head *rm_list)
+static void mptcp_pm_flush_addrs_and_subflows(struct mptcp_sock *msk,
+                                             struct list_head *rm_list)
 {
        struct mptcp_rm_list alist = { .nr = 0 }, slist = { .nr = 0 };
        struct mptcp_pm_addr_entry *entry;
@@ -1701,8 +1701,8 @@ static void mptcp_pm_remove_addrs_and_subflows(struct 
mptcp_sock *msk,
        spin_unlock_bh(&msk->pm.lock);
 }
 
-static void mptcp_nl_remove_addrs_list(struct net *net,
-                                      struct list_head *rm_list)
+static void mptcp_nl_flush_addrs_list(struct net *net,
+                                     struct list_head *rm_list)
 {
        long s_slot = 0, s_num = 0;
        struct mptcp_sock *msk;
@@ -1715,7 +1715,7 @@ static void mptcp_nl_remove_addrs_list(struct net *net,
 
                if (!mptcp_pm_is_userspace(msk)) {
                        lock_sock(sk);
-                       mptcp_pm_remove_addrs_and_subflows(msk, rm_list);
+                       mptcp_pm_flush_addrs_and_subflows(msk, rm_list);
                        release_sock(sk);
                }
 
@@ -1756,7 +1756,7 @@ int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, 
struct genl_info *info)
        pernet->next_id = 1;
        bitmap_zero(pernet->id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
        spin_unlock_bh(&pernet->lock);
-       mptcp_nl_remove_addrs_list(sock_net(skb->sk), &free_list);
+       mptcp_nl_flush_addrs_list(sock_net(skb->sk), &free_list);
        synchronize_rcu();
        __flush_addrs(&free_list);
        return 0;

-- 
2.45.2