Commit e38b117d authored Mar 01, 2024 by Geliang Tang Committed by David S. Miller Mar 04, 2024

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 8b1c94da
("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>

parent 86a628be

net/mptcp/pm_netlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1550,7 +1550,7 @@ 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,
		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 };

net/mptcp/protocol.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);