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 10/13] mptcp: drop useless addr_signal clear
Date: Fri, 26 Mar 2021 11:26:39 -0700 [thread overview]
Message-ID: <20210326182642.136419-10-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>
msk->pm.addr_signal is cleared in mptcp_pm_add_addr_signal, no need to
clear it in mptcp_pm_nl_add_addr_send_ack again. Drop it.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/mptcp/pm_netlink.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 56d479b24803..743bd23b1f78 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -538,7 +538,6 @@ static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)
subflow = list_first_entry_or_null(&msk->conn_list, typeof(*subflow), node);
if (subflow) {
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
- u8 add_addr;
spin_unlock_bh(&msk->pm.lock);
pr_debug("send ack for add_addr%s%s",
@@ -549,13 +548,6 @@ static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)
tcp_send_ack(ssk);
release_sock(ssk);
spin_lock_bh(&msk->pm.lock);
-
- add_addr = READ_ONCE(msk->pm.addr_signal);
- if (mptcp_pm_should_add_signal_ipv6(msk))
- add_addr &= ~BIT(MPTCP_ADD_ADDR_IPV6);
- if (mptcp_pm_should_add_signal_port(msk))
- add_addr &= ~BIT(MPTCP_ADD_ADDR_PORT);
- WRITE_ONCE(msk->pm.addr_signal, add_addr);
}
}
--
2.31.0
next prev parent reply other threads:[~2021-03-26 18:27 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 ` [PATCH net-next 04/13] mptcp: drop unused subflow in mptcp_pm_subflow_established Mat Martineau
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 ` Mat Martineau [this message]
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-10-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).