Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c47b7c72 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: move l2cap_sock_accept() to l2cap_sock.c 



Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent af6bcd82

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, 
							int proto, gfp_t prio);



int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags);

int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int flags);

int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer);

int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len);

int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags);

net/bluetooth/l2cap_core.c

+0 −56
Original line number Diff line number Diff line
@@ -993,62 +993,6 @@ int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int 
	return err;

}



int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int flags)

{

	DECLARE_WAITQUEUE(wait, current);

	struct sock *sk = sock->sk, *nsk;

	long timeo;

	int err = 0;



	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);



	if (sk->sk_state != BT_LISTEN) {

		err = -EBADFD;

		goto done;

	}



	timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);



	BT_DBG("sk %p timeo %ld", sk, timeo);



	/* Wait for an incoming connection. (wake-one). */

	add_wait_queue_exclusive(sk_sleep(sk), &wait);

	while (!(nsk = bt_accept_dequeue(sk, newsock))) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (!timeo) {

			err = -EAGAIN;

			break;

		}



		release_sock(sk);

		timeo = schedule_timeout(timeo);

		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);



		if (sk->sk_state != BT_LISTEN) {

			err = -EBADFD;

			break;

		}



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);

			break;

		}

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(sk_sleep(sk), &wait);



	if (err)

		goto done;



	newsock->state = SS_CONNECTED;



	BT_DBG("new socket %p", nsk);



done:

	release_sock(sk);

	return err;

}



int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer)

{

	struct sockaddr_l2 *la = (struct sockaddr_l2 *) addr;

net/bluetooth/l2cap_sock.c

+56 −0
Original line number Diff line number Diff line
@@ -197,6 +197,62 @@ static int l2cap_sock_listen(struct socket *sock, int backlog) 
	return err;

}



static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int flags)

{

	DECLARE_WAITQUEUE(wait, current);

	struct sock *sk = sock->sk, *nsk;

	long timeo;

	int err = 0;



	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);



	if (sk->sk_state != BT_LISTEN) {

		err = -EBADFD;

		goto done;

	}



	timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);



	BT_DBG("sk %p timeo %ld", sk, timeo);



	/* Wait for an incoming connection. (wake-one). */

	add_wait_queue_exclusive(sk_sleep(sk), &wait);

	while (!(nsk = bt_accept_dequeue(sk, newsock))) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (!timeo) {

			err = -EAGAIN;

			break;

		}



		release_sock(sk);

		timeo = schedule_timeout(timeo);

		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);



		if (sk->sk_state != BT_LISTEN) {

			err = -EBADFD;

			break;

		}



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);

			break;

		}

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(sk_sleep(sk), &wait);



	if (err)

		goto done;



	newsock->state = SS_CONNECTED;



	BT_DBG("new socket %p", nsk);



done:

	release_sock(sk);

	return err;

}



static int l2cap_sock_release(struct socket *sock)

{

	struct sock *sk = sock->sk;