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

Commit 644912e1 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Move bt_accept_enqueue() to l2cap_sock.c 



This is part of the move the parent socket usage to l2cap_sock.c

The change is safe when it comes to locking, bt_accept_enqueue() is still
protected by the parent socket lock inside the
l2cap_sock_new_connection_cb() code.

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

net/bluetooth/l2cap_core.c

+0 −4
Original line number Diff line number Diff line
@@ -1230,8 +1230,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 
	bacpy(&bt_sk(sk)->src, conn->src);

	bacpy(&bt_sk(sk)->dst, conn->dst);



	bt_accept_enqueue(parent, sk);



	l2cap_chan_add(conn, chan);



	l2cap_chan_ready(chan);
@@ -3448,8 +3446,6 @@ static void __l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, 
	chan->psm  = psm;

	chan->dcid = scid;



	bt_accept_enqueue(parent, sk);



	__l2cap_chan_add(conn, chan);



	dcid = chan->scid;

net/bluetooth/l2cap_sock.c

+2 −0
Original line number Diff line number Diff line
@@ -949,6 +949,8 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan) 


	l2cap_sock_init(sk, parent);



	bt_accept_enqueue(parent, sk);



	return l2cap_pi(sk)->chan;

}