summaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2025-07-04 08:03:18 +0200
committerPaolo Abeni <pabeni@redhat.com>2025-07-04 08:03:18 +0200
commit6b9fd8857b9fc4dd62e7cd300327f0e48dd76642 (patch)
tree1843ae1940d26bbb9473247da38f27c907ff7ed6 /Documentation/networking
parent5f712c3877f99d5b5e4d011955c6467ae0e535a6 (diff)
parent17bbde2e1716e2ee4b997d476b48ae85c5a47671 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.16-rc5). No conflicts. No adjacent changes. Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/tls.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/networking/tls.rst b/Documentation/networking/tls.rst
index c7904a1bc167..36cc7afc2527 100644
--- a/Documentation/networking/tls.rst
+++ b/Documentation/networking/tls.rst
@@ -16,11 +16,13 @@ User interface
Creating a TLS connection
-------------------------
-First create a new TCP socket and set the TLS ULP.
+First create a new TCP socket and once the connection is established set the
+TLS ULP.
.. code-block:: c
sock = socket(AF_INET, SOCK_STREAM, 0);
+ connect(sock, addr, addrlen);
setsockopt(sock, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));
Setting the TLS ULP allows us to set/get TLS socket options. Currently