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

Commit dc25306b authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Move l2cap_wait_ack() to l2cap_sock.c 



The wait_ack code has a heavy dependency on the socket data structures
and, as of now, it won't be worthless change it to use non-socket
structures as the only user of such feature is a socket.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5ec1bbe5

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -813,7 +813,6 @@ void l2cap_cleanup_sockets(void); 
bool l2cap_is_socket(struct socket *sock);



void __l2cap_connect_rsp_defer(struct l2cap_chan *chan);

int __l2cap_wait_ack(struct sock *sk);



int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);

int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);

net/bluetooth/l2cap_core.c

+0 −32
Original line number Diff line number Diff line
@@ -1894,38 +1894,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
	return err;

}



int __l2cap_wait_ack(struct sock *sk)

{

	struct l2cap_chan *chan = l2cap_pi(sk)->chan;

	DECLARE_WAITQUEUE(wait, current);

	int err = 0;

	int timeo = HZ/5;



	add_wait_queue(sk_sleep(sk), &wait);

	set_current_state(TASK_INTERRUPTIBLE);

	while (chan->unacked_frames > 0 && chan->conn) {

		if (!timeo)

			timeo = HZ/5;



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);

			break;

		}



		release_sock(sk);

		timeo = schedule_timeout(timeo);

		lock_sock(sk);

		set_current_state(TASK_INTERRUPTIBLE);



		err = sock_error(sk);

		if (err)

			break;

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(sk_sleep(sk), &wait);

	return err;

}



static void l2cap_monitor_timeout(struct work_struct *work)

{

	struct l2cap_chan *chan = container_of(work, struct l2cap_chan,

net/bluetooth/l2cap_sock.c

+32 −0
Original line number Diff line number Diff line
@@ -879,6 +879,38 @@ static void l2cap_sock_kill(struct sock *sk) 
	sock_put(sk);

}



static int __l2cap_wait_ack(struct sock *sk)

{

	struct l2cap_chan *chan = l2cap_pi(sk)->chan;

	DECLARE_WAITQUEUE(wait, current);

	int err = 0;

	int timeo = HZ/5;



	add_wait_queue(sk_sleep(sk), &wait);

	set_current_state(TASK_INTERRUPTIBLE);

	while (chan->unacked_frames > 0 && chan->conn) {

		if (!timeo)

			timeo = HZ/5;



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);

			break;

		}



		release_sock(sk);

		timeo = schedule_timeout(timeo);

		lock_sock(sk);

		set_current_state(TASK_INTERRUPTIBLE);



		err = sock_error(sk);

		if (err)

			break;

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(sk_sleep(sk), &wait);

	return err;

}



static int l2cap_sock_shutdown(struct socket *sock, int how)

{

	struct sock *sk = sock->sk;