From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: Geliang Tang <geliangtang@gmail.com>
Cc: mptcp@lists.linux.dev
Subject: Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add deny_join_id0 in mptcp_options_received"
Date: Thu, 10 Jun 2021 14:30:20 -0700 (PDT) [thread overview]
Message-ID: <bed4c37-75a3-8ed-fc45-baaae8b1d628@linux.intel.com> (raw)
In-Reply-To: <6670b769c9c6129d810282c3c8bd65e3317b1578.1623316231.git.geliangtang@gmail.com>
On Thu, 10 Jun 2021, Geliang Tang wrote:
> Move the deny_join_id0 test into check_fully_established as Paolo
> suggested.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> net/mptcp/options.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 0d30008f0313..63c1e18d61d5 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -910,6 +910,9 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
> return false;
> }
>
> + if (mp_opt->deny_join_id0)
> + WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
> +
> if (unlikely(!READ_ONCE(msk->pm.server_side)))
> pr_warn_once("bogus mpc option on established client sk");
> mptcp_subflow_fully_established(subflow, mp_opt);
> @@ -1051,8 +1054,6 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
> }
>
> mptcp_get_options(sk, skb, &mp_opt);
> - if (mp_opt.deny_join_id0)
> - WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
> if (!check_fully_established(msk, sk, subflow, skb, &mp_opt))
> return;
>
> --
> 2.31.1
Looks good, thanks Geliang.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
next prev parent reply other threads:[~2021-06-10 21:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 9:13 [MPTCP][PATCH mptcp-next] Squash to "mptcp: add deny_join_id0 in mptcp_options_received" Geliang Tang
2021-06-10 21:30 ` Mat Martineau [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-18 10:05 Geliang Tang
2021-05-18 21:41 ` Mat Martineau
2021-05-19 3:18 ` Mat Martineau
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=bed4c37-75a3-8ed-fc45-baaae8b1d628@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=geliangtang@gmail.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).