mptcp: make pm_remove_addrs_and_subflows static

mptcp_pm_remove_addrs_and_subflows() is only used in pm_netlink.c, it's
no longer used in pm_userspace.c any more since the commit 8b1c94da1e48
("mptcp: only send RM_ADDR in nl_cmd_remove"). So this patch changes it
to a static function.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d5a942b9ab295e7b6cf08c022fa468bdd41b0671..80c537659922f0f935856c35b962dee498c50932 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1550,8 +1550,8 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list)
        }
 }
 
-void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk,
-                                       struct list_head *rm_list)
+static void mptcp_pm_remove_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;

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 7cb502260dea99a0d2f366c702c54a827a715695..5d034e8ca85af7f6bc27aa513bee7b96a31e59b0 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -981,8 +981,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
 int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);
 int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);
 void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list);
-void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk,
-                                       struct list_head *rm_list);
 
 void mptcp_free_local_addr_list(struct mptcp_sock *msk);