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/rose | |
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/rose')
-rw-r--r-- | net/rose/af_rose.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index ef81d019b20f..59050caab65c 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -919,8 +919,8 @@ out_release: return err; } -static int rose_accept(struct socket *sock, struct socket *newsock, int flags, - bool kern) +static int rose_accept(struct socket *sock, struct socket *newsock, + struct proto_accept_arg *arg) { struct sk_buff *skb; struct sock *newsk; @@ -953,7 +953,7 @@ static int rose_accept(struct socket *sock, struct socket *newsock, int flags, if (skb) break; - if (flags & O_NONBLOCK) { + if (arg->flags & O_NONBLOCK) { err = -EWOULDBLOCK; break; } |