diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2022-04-29 21:11:15 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-04-29 21:11:15 -0600 |
| commit | a4c76853609107f0e5e7b51571d966785fe89cb3 (patch) | |
| tree | 61e8bbfbb154144942a0c77841b7bbe87ebd3c86 /include | |
| parent | Merge branch 'for-5.19/io_uring-socket' into for-5.19/io_uring-net (diff) | |
| parent | tcp: pass back data left in socket after receive (diff) | |
| download | linux-dev-a4c76853609107f0e5e7b51571d966785fe89cb3.tar.xz linux-dev-a4c76853609107f0e5e7b51571d966785fe89cb3.zip | |
Merge branch 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux into for-5.19/io_uring-net
Merge net branch with the required patch for supporting the io_uring
feature that passes back whether we had more data in the socket or not.
* 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux:
tcp: pass back data left in socket after receive
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/socket.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index a1882e1e71d2..17311ad9f9af 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -50,6 +50,9 @@ struct linger { struct msghdr { void *msg_name; /* ptr to socket address structure */ int msg_namelen; /* size of socket address structure */ + + int msg_inq; /* output, data left in socket */ + struct iov_iter msg_iter; /* data */ /* @@ -62,8 +65,9 @@ struct msghdr { void __user *msg_control_user; }; bool msg_control_is_user : 1; - __kernel_size_t msg_controllen; /* ancillary data buffer length */ + bool msg_get_inq : 1;/* return INQ after receive */ unsigned int msg_flags; /* flags on received message */ + __kernel_size_t msg_controllen; /* ancillary data buffer length */ struct kiocb *msg_iocb; /* ptr to iocb for async requests */ }; |