summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-08-01 09:11:19 +0300
committerTakashi Iwai <tiwai@suse.de>2022-08-01 09:11:19 +0300
commit9769e44d41a1359b9000ff8458f0f2f66080ebf4 (patch)
treee91d2d71fd469c2fa9289fed87f0bb4fded196a5 /include/uapi/linux
parentf38e6458e16df7bac3871f4e69f9681c0b3c58bd (diff)
parentbe561ffad708f0cee18aee4231f80ffafaf7a419 (diff)
downloadlinux-9769e44d41a1359b9000ff8458f0f2f66080ebf4.tar.xz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/tls.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
index ac39328eabe7..bb8f80812b0b 100644
--- a/include/uapi/linux/tls.h
+++ b/include/uapi/linux/tls.h
@@ -39,7 +39,7 @@
/* TLS socket options */
#define TLS_TX 1 /* Set transmit parameters */
#define TLS_RX 2 /* Set receive parameters */
-#define TLS_TX_ZEROCOPY_SENDFILE 3 /* transmit zerocopy sendfile */
+#define TLS_TX_ZEROCOPY_RO 3 /* TX zerocopy (only sendfile now) */
/* Supported versions */
#define TLS_VERSION_MINOR(ver) ((ver) & 0xFF)
@@ -161,7 +161,7 @@ enum {
TLS_INFO_CIPHER,
TLS_INFO_TXCONF,
TLS_INFO_RXCONF,
- TLS_INFO_ZC_SENDFILE,
+ TLS_INFO_ZC_RO_TX,
__TLS_INFO_MAX,
};
#define TLS_INFO_MAX (__TLS_INFO_MAX - 1)