[net-next,08/13] mptcp: export lookup_anno_list_by_saddr

Message ID	20210326182642.136419-8-mathew.j.martineau@linux.intel.com
State	New
Headers	show Return-Path: <netdev-owner@kernel.org> IronPort-SDR: dHRhRBCb8uTxRrE2Puv1L+NEXhBeVg97/C6SqAiVs5sFIkWxvYQKfRJoRM1si4N+VIBWr85D3D /+ildHRGj9FQ== IronPort-SDR: YfBX/v9d2ghUqqTSLI5T3Tb37AtnafMYlsYEQ3FJc1V2j4zVylDbdKnY10bPxXyakO5a4dWdaB h38KU1/hwDfg== From: Mat Martineau <mathew.j.martineau@linux.intel.com> To: netdev@vger.kernel.org Cc: Geliang Tang <geliangtang@gmail.com>, davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau <mathew.j.martineau@linux.intel.com> Subject: [PATCH net-next 08/13] mptcp: export lookup_anno_list_by_saddr Date: Fri, 26 Mar 2021 11:26:37 -0700 Message-Id: <20210326182642.136419-8-mathew.j.martineau@linux.intel.com> In-Reply-To: <20210326182642.136419-1-mathew.j.martineau@linux.intel.com> References: <20210326182307.136256-1-mathew.j.martineau@linux.intel.com> <20210326182642.136419-1-mathew.j.martineau@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	MPTCP: Cleanup and address advertisement fixes \| expand [net-next,00/13] MPTCP: Cleanup and address advertisement fixes [net-next,01/13] mptcp: clean-up the rtx path [net-next,02/13] mptcp: drop argument port from mptcp_pm_announce_addr [net-next,03/13] mptcp: skip connecting the connected address [net-next,04/13] mptcp: drop unused subflow in mptcp_pm_subflow_established [net-next,05/13] mptcp: move to next addr when timeout [net-next,06/13] selftests: mptcp: add cfg_do_w for cfg_remove [net-next,07/13] selftests: mptcp: timeout testcases for multi addresses [net-next,08/13] mptcp: export lookup_anno_list_by_saddr [net-next,09/13] mptcp: move to next addr when subflow creation fail [net-next,10/13] mptcp: drop useless addr_signal clear [net-next,11/13] mptcp: send ack for rm_addr [net-next,12/13] mptcp: rename mptcp_pm_nl_add_addr_send_ack [net-next,13/13] selftests: mptcp: signal addresses testcases

Message ID

20210326182642.136419-8-mathew.j.martineau@linux.intel.com

State

New

Headers

IronPort-SDR: dHRhRBCb8uTxRrE2Puv1L+NEXhBeVg97/C6SqAiVs5sFIkWxvYQKfRJoRM1si4N+VIBWr85D3D
	/+ildHRGj9FQ==
IronPort-SDR: YfBX/v9d2ghUqqTSLI5T3Tb37AtnafMYlsYEQ3FJc1V2j4zVylDbdKnY10bPxXyakO5a4dWdaB
	h38KU1/hwDfg==
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Geliang Tang <geliangtang@gmail.com>, davem@davemloft.net,
	kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev,
	Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 08/13] mptcp: export lookup_anno_list_by_saddr
Date: Fri, 26 Mar 2021 11:26:37 -0700
Message-Id: <20210326182642.136419-8-mathew.j.martineau@linux.intel.com>
In-Reply-To: <20210326182642.136419-1-mathew.j.martineau@linux.intel.com>
References: <20210326182307.136256-1-mathew.j.martineau@linux.intel.com>
	<20210326182642.136419-1-mathew.j.martineau@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

MPTCP: Cleanup and address advertisement fixes | expand

Commit Message

Mat Martineau March 26, 2021, 6:26 p.m. UTC

From: Geliang Tang <geliangtang@gmail.com>

This patch exported the static function lookup_anno_list_by_saddr, and
renamed it to mptcp_lookup_anno_list_by_saddr.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 net/mptcp/pm_netlink.c | 10 +++++-----
 net/mptcp/protocol.h   |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index c0c942c101cb..56d479b24803 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -263,9 +263,9 @@  static void check_work_pending(struct mptcp_sock *msk)
 		WRITE_ONCE(msk->pm.work_pending, false);
 }
 
-static struct mptcp_pm_add_entry *
-lookup_anno_list_by_saddr(struct mptcp_sock *msk,
-			  struct mptcp_addr_info *addr)
+struct mptcp_pm_add_entry *
+mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
+				struct mptcp_addr_info *addr)
 {
 	struct mptcp_pm_add_entry *entry;
 
@@ -352,7 +352,7 @@  mptcp_pm_del_add_timer(struct mptcp_sock *msk,
 	struct sock *sk = (struct sock *)msk;
 
 	spin_lock_bh(&msk->pm.lock);
-	entry = lookup_anno_list_by_saddr(msk, addr);
+	entry = mptcp_lookup_anno_list_by_saddr(msk, addr);
 	if (entry)
 		entry->retrans_times = ADD_ADDR_RETRANS_MAX;
 	spin_unlock_bh(&msk->pm.lock);
@@ -372,7 +372,7 @@  static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
 
 	lockdep_assert_held(&msk->pm.lock);
 
-	if (lookup_anno_list_by_saddr(msk, &entry->addr))
+	if (mptcp_lookup_anno_list_by_saddr(msk, &entry->addr))
 		return false;
 
 	add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index d04161ec1cb2..9c51444b26cf 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -659,6 +659,9 @@  bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk);
 struct mptcp_pm_add_entry *
 mptcp_pm_del_add_timer(struct mptcp_sock *msk,
 		       struct mptcp_addr_info *addr);
+struct mptcp_pm_add_entry *
+mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
+				struct mptcp_addr_info *addr);
 
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,
 			   const struct mptcp_addr_info *addr,

[net-next,08/13] mptcp: export lookup_anno_list_by_saddr

Commit Message

Patch