Merge tag 'net-accept-more-20240515' of git://git.kernel.dk/linux

[thirdparty/kernel/linux.git] / net / bluetooth / l2cap_sock.c

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 8645461d45e81a8c458172db0e0a595d5ea5c35d..6db60946c627cf8bdda1bcb23d42fdb9bbae78ea 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -327,7 +327,7 @@ done:
 }
 
 static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
-                            int flags, bool kern)
+                            struct proto_accept_arg *arg)
 {
        DEFINE_WAIT_FUNC(wait, woken_wake_function);
        struct sock *sk = sock->sk, *nsk;
@@ -336,7 +336,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
 
        lock_sock_nested(sk, L2CAP_NESTING_PARENT);
 
-       timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
+       timeo = sock_rcvtimeo(sk, arg->flags & O_NONBLOCK);
 
        BT_DBG("sk %p timeo %ld", sk, timeo);