Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Paolo Abeni <pabeni@redhat.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 1/5] mptcp: do not set unconditionally csum_reqd on incoming opt
Date: Thu, 26 Aug 2021 17:44:50 -0700 [thread overview]
Message-ID: <20210827004455.286754-2-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20210827004455.286754-1-mathew.j.martineau@linux.intel.com>
From: Paolo Abeni <pabeni@redhat.com>
Should be set only if the ingress packets present it, otherwise
we can confuse csum validation.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/mptcp/options.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index bec3ed82e253..f012a71dd996 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -355,8 +355,6 @@ void mptcp_get_options(const struct sock *sk,
const struct sk_buff *skb,
struct mptcp_options_received *mp_opt)
{
- struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
- struct mptcp_sock *msk = mptcp_sk(subflow->conn);
const struct tcphdr *th = tcp_hdr(skb);
const unsigned char *ptr;
int length;
@@ -372,7 +370,7 @@ void mptcp_get_options(const struct sock *sk,
mp_opt->dss = 0;
mp_opt->mp_prio = 0;
mp_opt->reset = 0;
- mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
+ mp_opt->csum_reqd = 0;
mp_opt->deny_join_id0 = 0;
mp_opt->mp_fail = 0;
--
2.33.0
next prev parent reply other threads:[~2021-08-27 0:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 0:44 [PATCH net-next 0/5] mptcp: Optimize received options handling Mat Martineau
2021-08-27 0:44 ` Mat Martineau [this message]
2021-08-27 0:44 ` [PATCH net-next 2/5] mptcp: better binary layout for mptcp_options_received Mat Martineau
2021-08-27 0:44 ` [PATCH net-next 3/5] mptcp: consolidate in_opt sub-options fields in a bitmask Mat Martineau
2021-08-27 0:44 ` [PATCH net-next 4/5] mptcp: optimize the input options processing Mat Martineau
2021-08-27 0:44 ` [PATCH net-next 5/5] mptcp: make the locking tx schema more readable Mat Martineau
2021-08-27 9:10 ` [PATCH net-next 0/5] mptcp: Optimize received options handling 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=20210827004455.286754-2-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--subject='Re: [PATCH net-next 1/5] mptcp: do not set unconditionally csum_reqd on incoming opt' \
/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
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).