[net-next,v3,1/2] tcp: add SO_PEEK_OFF socket option tor TCPv6

Commit Message

Jon Maloy Aug. 28, 2024, 6:37 p.m. UTC

From: Jon Maloy <[e-mail]>

When doing further testing of the recently added SO_PEEK_OFF feature
for TCP I realized I had omitted to add it for TCP/IPv6.

I do that here.

Fixes: 05ea491641d3 ("tcp: add support for SO_PEEK_OFF socket option")
Reviewed-by: Eric Dumazet <[e-mail]>
Reviewed-by: David Gibson <[e-mail]>
Reviewed-by: Stefano Brivio <[e-mail]>
Tested-by: Stefano Brivio <[e-mail]>
Signed-off-by: Jon Maloy <[e-mail]>

---
v2: Removed redundant whitespace between "Fixes" and
    "Signed-off-by" lines. Based on feedback from J. Kicinski.
v3: Rephrased commit log to make it clear how the TCP/IPv6 omission
    was discovered. Based on feedback from J. Kicinski.
---
 net/ipv6/af_inet6.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Jason Xing Aug. 28, 2024, 11:54 p.m. UTC | #1

On Thu, Aug 29, 2024 at 2:38 AM <[e-mail]> wrote:
>
> From: Jon Maloy <[e-mail]>
>
> When doing further testing of the recently added SO_PEEK_OFF feature
> for TCP I realized I had omitted to add it for TCP/IPv6.
>
> I do that here.
>
> Fixes: 05ea491641d3 ("tcp: add support for SO_PEEK_OFF socket option")
> Reviewed-by: Eric Dumazet <[e-mail]>
> Reviewed-by: David Gibson <[e-mail]>
> Reviewed-by: Stefano Brivio <[e-mail]>
> Tested-by: Stefano Brivio <[e-mail]>
> Signed-off-by: Jon Maloy <[e-mail]>

Reviewed-by: Jason Xing <[e-mail]>

Patch

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,