diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-23 09:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-23 09:55:50 -0700 |
| commit | 942e01ab90151a16b79b5c0cb8e77530d1ee3dbb (patch) | |
| tree | d703a4ca1471314aff9aa3092c2681099f8dfe3d /include/linux | |
| parent | Merge tag 'hwmon-for-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
| parent | io_uring/net: fail zc sendmsg when unsupported by socket (diff) | |
| download | linux-dev-942e01ab90151a16b79b5c0cb8e77530d1ee3dbb.tar.xz linux-dev-942e01ab90151a16b79b5c0cb8e77530d1ee3dbb.zip | |
Merge tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux
Pull io_uring follow-up from Jens Axboe:
"Currently the zero-copy has automatic fallback to normal transmit, and
it was decided that it'd be cleaner to return an error instead if the
socket type doesn't support it.
Zero-copy does work with UDP and TCP, it's more of a future proofing
kind of thing (eg for samba)"
* tag 'io_uring-6.1-2022-10-22' of git://git.kernel.dk/linux:
io_uring/net: fail zc sendmsg when unsupported by socket
io_uring/net: fail zc send when unsupported by socket
net: flag sockets supporting msghdr originated zerocopy
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 711c3593c3b8..18d942bbdf6e 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -41,6 +41,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 +#define SOCK_SUPPORT_ZC 5 #ifndef ARCH_HAS_SOCKET_TYPES /** |