From owner-dev-commits-src-branches@freebsd.org Thu Mar 11 23:38:27 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 599575AF66F; Thu, 11 Mar 2021 23:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DxQPH2872z4XZ7; Thu, 11 Mar 2021 23:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C81F5A31; Thu, 11 Mar 2021 23:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12BNcRk5027738; Thu, 11 Mar 2021 23:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12BNcRmK027737; Thu, 11 Mar 2021 23:38:27 GMT (envelope-from git) Date: Thu, 11 Mar 2021 23:38:27 GMT Message-Id: <202103112338.12BNcRmK027737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3b9e12f66e0c - releng/13.0 - Correct the name of the structure used for TCP socket options. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 3b9e12f66e0cfd0c7db0eda9f72770499a6408b8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2021 23:38:27 -0000 The branch releng/13.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9e12f66e0cfd0c7db0eda9f72770499a6408b8 commit 3b9e12f66e0cfd0c7db0eda9f72770499a6408b8 Author: John Baldwin AuthorDate: 2021-03-08 18:46:40 +0000 Commit: John Baldwin CommitDate: 2021-03-11 23:37:45 +0000 Correct the name of the structure used for TCP socket options. The structure was renamed while refactoring Netflix's KTLS changes for upstreaming, but the original name remained in tcp.4 and was subsequently copied to ktls.4. PR: 254141 Reported by: asomers Approved by: re (gjb) (cherry picked from commit c5a365623f88999b524d94003187ef09fda55f67) (cherry picked from commit 0fc5395122b4b50564f3dc9164830a0d1635b622) --- share/man/man4/ktls.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/ktls.4 b/share/man/man4/ktls.4 index 21e1a1bdb6ca..648eeaedfa6a 100644 --- a/share/man/man4/ktls.4 +++ b/share/man/man4/ktls.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2021 +.Dd March 8, 2021 .Dt KTLS 4 .Os .Sh NAME @@ -54,7 +54,7 @@ and .Dv TCP_RXTLS_ENABLE socket options. Both socket options accept a -.Vt struct tls_so_enable +.Vt struct tls_enable structure as their argument. The members of this structure describe the cipher suite used for the TLS session and provide the session keys used for the respective @@ -166,7 +166,7 @@ will fail with one of the following errors: .It Bq Er EINVAL The version fields in a TLS record's header did not match the version required by the -.Vt struct tls_so_enable +.Vt struct tls_enable structure used to enable in-kernel TLS. .It Bq Er EMSGSIZE A TLS record's length was either too small or too large.