diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-05-09 17:20:08 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-05-14 02:19:09 +0200 |
| commit | 92ef0fd55ac80dfc2e4654edfe5d1ddfa6e070fe (patch) | |
| tree | 7356b1c61b8d9bd942cc517a1050bdecb9c2c5c2 /net/atm/svc.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next into net-... (diff) | |
| download | linux-92ef0fd55ac80dfc2e4654edfe5d1ddfa6e070fe.tar.xz 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 'net/atm/svc.c')
| -rw-r--r-- | net/atm/svc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/atm/svc.c b/net/atm/svc.c index 36a814f1fbd1..f8137ae693b0 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -324,8 +324,8 @@ out: return error; } -static int svc_accept(struct socket *sock, struct socket *newsock, int flags, - bool kern) +static int svc_accept(struct socket *sock, struct socket *newsock, + struct proto_accept_arg *arg) { struct sock *sk = sock->sk; struct sk_buff *skb; @@ -336,7 +336,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags, lock_sock(sk); - error = svc_create(sock_net(sk), newsock, 0, kern); + error = svc_create(sock_net(sk), newsock, 0, arg->kern); if (error) goto out; @@ -355,7 +355,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags, error = -sk->sk_err; break; } - if (flags & O_NONBLOCK) { + if (arg->flags & O_NONBLOCK) { error = -EAGAIN; break; } |