From: jmaloy@redhat.com
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: kuba@kernel.org, passt-dev@passt.top, jmaloy@redhat.com,
sbrivio@redhat.com, lvivier@redhat.com, dgibson@redhat.com,
eric.dumazet@gmail.com, edumazet@google.com
Subject: [net-next, v2 1/2] tcp: add SO_PEEK_OFF socket option tor TCPv6
Date: Mon, 26 Aug 2024 15:49:31 -0400 [thread overview]
Message-ID: <20240826194932.420992-2-jmaloy@redhat.com> (raw)
In-Reply-To: <20240826194932.420992-1-jmaloy@redhat.com>
From: Jon Maloy <jmaloy@redhat.com>
When we added the SO_PEEK_OFF socket option to TCP we forgot
to add it even for TCP on IPv6.
We do that here.
Fixes: 05ea491641d3 ("tcp: add support for SO_PEEK_OFF socket option")
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Tested-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
---
net/ipv6/af_inet6.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 90d2c7e3f5e9..ba69b86f1c7d 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -708,6 +708,7 @@ const struct proto_ops inet6_stream_ops = {
.splice_eof = inet_splice_eof,
.sendmsg_locked = tcp_sendmsg_locked,
.splice_read = tcp_splice_read,
+ .set_peek_off = sk_set_peek_off,
.read_sock = tcp_read_sock,
.read_skb = tcp_read_skb,
.peek_len = tcp_peek_len,
--
@@ -708,6 +708,7 @@ const struct proto_ops inet6_stream_ops = {
.splice_eof = inet_splice_eof,
.sendmsg_locked = tcp_sendmsg_locked,
.splice_read = tcp_splice_read,
+ .set_peek_off = sk_set_peek_off,
.read_sock = tcp_read_sock,
.read_skb = tcp_read_skb,
.peek_len = tcp_peek_len,
--
2.45.2
next prev parent reply other threads:[~2024-08-26 19:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-26 19:49 [net-next, v2 0/2] Adding SO_PEEK_OFF for TCPv6 jmaloy
2024-08-26 19:49 ` jmaloy [this message]
2024-08-27 0:30 ` [net-next, v2 1/2] tcp: add SO_PEEK_OFF socket option tor TCPv6 Jason Xing
2024-08-26 19:49 ` [net-next, v2 2/2] selftests: add selftest for tcp SO_PEEK_OFF support jmaloy
2024-08-27 0:19 ` Jason Xing
2024-08-27 21:50 ` Jakub Kicinski
2024-08-28 16:24 ` Jon Maloy
2024-08-28 17:43 ` Jakub Kicinski
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=20240826194932.420992-2-jmaloy@redhat.com \
--to=jmaloy@redhat.com \
--cc=davem@davemloft.net \
--cc=dgibson@redhat.com \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=kuba@kernel.org \
--cc=lvivier@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
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 IMAP folder(s).