All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
	 Geliang Tang <geliang@kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	 Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc: Geliang Tang <tanggeliang@kylinos.cn>,
	netdev@vger.kernel.org,  linux-kernel@vger.kernel.org,
	linux-kselftest@vger.kernel.org,
	 "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH net-next 01/15] mptcp: make pm_remove_addrs_and_subflows static
Date: Fri, 01 Mar 2024 19:18:25 +0100	[thread overview]
Message-ID: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-1-dc30a420b3a0@kernel.org> (raw)
In-Reply-To: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-0-dc30a420b3a0@kernel.org>

From: Geliang Tang <tanggeliang@kylinos.cn>

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>
---
 net/mptcp/pm_netlink.c | 4 ++--
 net/mptcp/protocol.h   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d5a942b9ab29..80c537659922 100644
--- 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 d0a7955b96c4..b85d1a8d111b 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -959,8 +959,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);
 

-- 
2.43.0


  reply	other threads:[~2024-03-01 18:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-01 18:18 [PATCH net-next 00/15] mptcp: userspace pm: 'dump addrs' and 'get addr' Matthieu Baerts (NGI0)
2024-03-01 18:18 ` Matthieu Baerts (NGI0) [this message]
2024-03-01 18:18 ` [PATCH net-next 02/15] mptcp: export mptcp_genl_family & mptcp_nl_fill_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 03/15] mptcp: implement mptcp_userspace_pm_dump_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 04/15] mptcp: add token for get-addr in yaml Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 05/15] mptcp: dump addrs in userspace pm list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 06/15] mptcp: check userspace pm flags Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 07/15] selftests: mptcp: add userspace pm subflow flag Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 08/15] selftests: mptcp: add token for dump_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 09/15] selftests: mptcp: add mptcp_lib_check_output helper Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 10/15] selftests: mptcp: dump userspace addrs list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 11/15] mptcp: add userspace_pm_lookup_addr_by_id helper Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 12/15] mptcp: implement mptcp_userspace_pm_get_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 13/15] mptcp: get addr in userspace pm list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 14/15] selftests: mptcp: add token for get_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 15/15] selftests: mptcp: userspace pm get addr tests Matthieu Baerts (NGI0)
2024-03-04 13:10 ` [PATCH net-next 00/15] mptcp: userspace pm: 'dump addrs' and 'get addr' patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-1-dc30a420b3a0@kernel.org \
    --to=matttbe@kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=geliang@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=martineau@kernel.org \
    --cc=mptcp@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@kernel.org \
    --cc=tanggeliang@kylinos.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.