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

Commit cf4cd009 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Change chan_ready param from sk to chan 



Change is needed to remove dependency on sk when possible
before introducing l2cap channel lock.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 343fb145

net/bluetooth/l2cap_core.c

+6 −6
Original line number Diff line number Diff line
@@ -907,9 +907,9 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 
	release_sock(parent);

}



static void l2cap_chan_ready(struct sock *sk)

static void l2cap_chan_ready(struct l2cap_chan *chan)

{

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

	struct sock *sk = chan->sk;

	struct sock *parent = bt_sk(sk)->parent;



	BT_DBG("sk %p, parent %p", sk, parent);
@@ -945,7 +945,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn) 


		if (conn->hcon->type == LE_LINK) {

			if (smp_conn_security(conn, chan->sec_level))

				l2cap_chan_ready(sk);

				l2cap_chan_ready(chan);



		} else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {

			__clear_chan_timer(chan);
@@ -2874,7 +2874,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
		if (chan->mode == L2CAP_MODE_ERTM)

			l2cap_ertm_init(chan);



		l2cap_chan_ready(sk);

		l2cap_chan_ready(chan);

		goto unlock;

	}
@@ -3005,7 +3005,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
		if (chan->mode ==  L2CAP_MODE_ERTM)

			l2cap_ertm_init(chan);



		l2cap_chan_ready(sk);

		l2cap_chan_ready(chan);

	}



done:
@@ -4524,7 +4524,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
		if (chan->scid == L2CAP_CID_LE_DATA) {

			if (!status && encrypt) {

				chan->sec_level = hcon->sec_level;

				l2cap_chan_ready(sk);

				l2cap_chan_ready(chan);

			}



			bh_unlock_sock(sk);