diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2024-05-09 09:20:08 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-05-13 18:19:09 -0600 |
| commit | 92ef0fd55ac80dfc2e4654edfe5d1ddfa6e070fe (patch) | |
| tree | 7356b1c61b8d9bd942cc517a1050bdecb9c2c5c2 /include/net/sock.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next into net-accept-more (diff) | |
| download | wireguard-linux-92ef0fd55ac80dfc2e4654edfe5d1ddfa6e070fe.tar.xz wireguard-linux-92ef0fd55ac80dfc2e4654edfe5d1ddfa6e070fe.zip | |
net: change proto and proto_ops accept type
Rather than pass in flags, error pointer, and whether this is a kernel
invocation or not, add a struct proto_accept_arg struct as the argument.
This then holds all of these arguments, and prepares accept for being
able to pass back more information.
No functional changes in this patch.
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 0450494a1766..217079b3e3e8 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1194,6 +1194,12 @@ static inline void sk_prot_clear_nulls(struct sock *sk, int size) size - offsetof(struct sock, sk_node.pprev)); } +struct proto_accept_arg { + int flags; + int err; + bool kern; +}; + /* Networking protocol blocks we attach to sockets. * socket layer -> transport layer interface */ @@ -1208,8 +1214,8 @@ struct proto { int addr_len); int (*disconnect)(struct sock *sk, int flags); - struct sock * (*accept)(struct sock *sk, int flags, int *err, - bool kern); + struct sock * (*accept)(struct sock *sk, + struct proto_accept_arg *arg); int (*ioctl)(struct sock *sk, int cmd, int *karg); @@ -1804,7 +1810,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg, int sock_no_bind(struct socket *, struct sockaddr *, int); int sock_no_connect(struct socket *, struct sockaddr *, int, int); int sock_no_socketpair(struct socket *, struct socket *); -int sock_no_accept(struct socket *, struct socket *, int, bool); +int sock_no_accept(struct socket *, struct socket *, struct proto_accept_arg *); int sock_no_getname(struct socket *, struct sockaddr *, int); int sock_no_ioctl(struct socket *, unsigned int, unsigned long); int sock_no_listen(struct socket *, int); |