From: Geliang Tang <geliangtang@gmail.com>
To: Yonglong Li <liyonglong@chinatelecom.cn>
Cc: mptcp@lists.linux.dev,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: Re: [PATCH v5 4/4] mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT
Date: Fri, 25 Jun 2021 18:01:54 +0800 [thread overview]
Message-ID: <CA+WQbwvEu+7BUyumARc57QLcye5sYdzZxavSq72-BFCfzy9Jaw@mail.gmail.com> (raw)
In-Reply-To: <1624337135-149084-5-git-send-email-liyonglong@chinatelecom.cn>
Yonglong Li <liyonglong@chinatelecom.cn> 于2021年6月22日周二 下午12:46写道:
>
> there not need MPTCP_ADD_ADDR_PORT and MPTCP_ADD_ADDR_PORT, we can
> get these info from pm.addr or pm.remote
There's no pm.addr, do you mean pm.local?
>
> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
> ---
> net/mptcp/pm.c | 4 ----
> net/mptcp/pm_netlink.c | 6 ++----
> net/mptcp/protocol.h | 12 ------------
> 3 files changed, 2 insertions(+), 20 deletions(-)
>
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index a62d4a5..f051e48 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -35,10 +35,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
> msk->pm.local = *addr;
> add_addr |= BIT(MPTCP_ADD_ADDR_SIGNAL);
> }
> - if (addr->family == AF_INET6)
> - add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);
> - if (addr->port)
> - add_addr |= BIT(MPTCP_ADD_ADDR_PORT);
> WRITE_ONCE(msk->pm.addr_signal, add_addr);
> return 0;
> }
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 0f302d2..bfa9d6d 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -543,10 +543,8 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)
> bool slow;
>
> spin_unlock_bh(&msk->pm.lock);
> - pr_debug("send ack for %s%s%s",
> - mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr",
> - mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "",
> - mptcp_pm_should_add_signal_port(msk) ? " [port]" : "");
> + pr_debug("send ack for %s",
> + mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr");
>
> slow = lock_sock_fast(ssk);
> tcp_send_ack(ssk);
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 90fb532..71e747c 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -176,8 +176,6 @@ enum mptcp_pm_status {
> enum mptcp_addr_signal_status {
> MPTCP_ADD_ADDR_SIGNAL,
> MPTCP_ADD_ADDR_ECHO,
> - MPTCP_ADD_ADDR_IPV6,
> - MPTCP_ADD_ADDR_PORT,
> MPTCP_RM_ADDR_SIGNAL,
> };
>
> @@ -723,16 +721,6 @@ static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk)
> return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);
> }
>
> -static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)
> -{
> - return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);
> -}
> -
> -static inline bool mptcp_pm_should_add_signal_port(struct mptcp_sock *msk)
> -{
> - return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_PORT);
> -}
> -
> static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)
> {
> return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2021-06-25 10:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 4:45 [PATCH v5 0/4] mptcp: fix conflicts when using pm.add_signal in ADD_ADDR/echo and RM_ADDR process Yonglong Li
2021-06-22 4:45 ` [PATCH v5 1/4] mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other Yonglong Li
2021-06-22 4:45 ` [PATCH v5 2/4] mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate Yonglong Li
2021-06-25 10:33 ` Geliang Tang
2021-06-22 4:45 ` [PATCH v5 3/4] mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal Yonglong Li
2021-06-25 4:44 ` Geliang Tang
2021-06-25 9:43 ` Yonglong Li
2021-06-25 10:39 ` Geliang Tang
2021-06-25 11:43 ` Geliang Tang
2021-06-25 12:29 ` Geliang Tang
2021-06-22 4:45 ` [PATCH v5 4/4] mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT Yonglong Li
2021-06-25 10:01 ` Geliang Tang [this message]
2021-06-25 0:28 ` [PATCH v5 0/4] mptcp: fix conflicts when using pm.add_signal in ADD_ADDR/echo and RM_ADDR process Mat Martineau
2021-06-25 1:47 ` Yonglong Li
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=CA+WQbwvEu+7BUyumARc57QLcye5sYdzZxavSq72-BFCfzy9Jaw@mail.gmail.com \
--to=geliangtang@gmail.com \
--cc=liyonglong@chinatelecom.cn \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.linux.dev \
/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).