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 04/13] mptcp: drop unused subflow in mptcp_pm_subflow_established
Date: Fri, 26 Mar 2021 11:26:33 -0700 [thread overview]
Message-ID: <20210326182642.136419-4-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20210326182642.136419-1-mathew.j.martineau@linux.intel.com>
From: Geliang Tang <geliangtang@gmail.com>
This patch drops the unused parameter subflow in
mptcp_pm_subflow_established().
Fixes: 926bdeab5535 ("mptcp: Implement path manager interface commands")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/mptcp/options.c | 2 +-
net/mptcp/pm.c | 3 +--
net/mptcp/protocol.h | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 2b7eec93c9f5..2d2340b22f61 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -882,7 +882,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
subflow->pm_notified = 1;
if (subflow->mp_join) {
clear_3rdack_retransmission(ssk);
- mptcp_pm_subflow_established(msk, subflow);
+ mptcp_pm_subflow_established(msk);
} else {
mptcp_pm_fully_established(msk, ssk, GFP_ATOMIC);
}
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 51e60582b408..0a06d5947a73 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -152,8 +152,7 @@ void mptcp_pm_connection_closed(struct mptcp_sock *msk)
pr_debug("msk=%p", msk);
}
-void mptcp_pm_subflow_established(struct mptcp_sock *msk,
- struct mptcp_subflow_context *subflow)
+void mptcp_pm_subflow_established(struct mptcp_sock *msk)
{
struct mptcp_pm_data *pm = &msk->pm;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 2bcd6897ea7d..d04161ec1cb2 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -643,8 +643,7 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int
void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp);
bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);
void mptcp_pm_connection_closed(struct mptcp_sock *msk);
-void mptcp_pm_subflow_established(struct mptcp_sock *msk,
- struct mptcp_subflow_context *subflow);
+void mptcp_pm_subflow_established(struct mptcp_sock *msk);
void mptcp_pm_subflow_closed(struct mptcp_sock *msk, u8 id);
void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
const struct mptcp_addr_info *addr);
--
2.31.0
next prev parent reply other threads:[~2021-03-26 18:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 18:23 [PATCH net-next 00/13] MPTCP: Cleanup and address advertisement fixes Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 01/13] mptcp: clean-up the rtx path Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 02/13] mptcp: drop argument port from mptcp_pm_announce_addr Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 03/13] mptcp: skip connecting the connected address Mat Martineau
2021-03-26 18:26 ` Mat Martineau [this message]
2021-03-26 18:26 ` [PATCH net-next 05/13] mptcp: move to next addr when timeout Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 06/13] selftests: mptcp: add cfg_do_w for cfg_remove Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 07/13] selftests: mptcp: timeout testcases for multi addresses Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 08/13] mptcp: export lookup_anno_list_by_saddr Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 09/13] mptcp: move to next addr when subflow creation fail Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 10/13] mptcp: drop useless addr_signal clear Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 11/13] mptcp: send ack for rm_addr Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 12/13] mptcp: rename mptcp_pm_nl_add_addr_send_ack Mat Martineau
2021-03-26 18:26 ` [PATCH net-next 13/13] selftests: mptcp: signal addresses testcases Mat Martineau
2021-03-26 22:10 ` [PATCH net-next 00/13] MPTCP: Cleanup and address advertisement fixes 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=20210326182642.136419-4-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=geliangtang@gmail.com \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).