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

Commit 60bac184 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Remove useless sk variable in l2cap_le_conn_ready 



The sk variable is of quite little use since it's only used to simplify
access in the two bt_sk() calls.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 97f57c0b

net/bluetooth/l2cap_core.c

+3 −5
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ static struct l2cap_chan *l2cap_global_chan_by_scid(int state, u16 cid, 


static void l2cap_le_conn_ready(struct l2cap_conn *conn)

{

	struct sock *parent, *sk;

	struct sock *parent;

	struct l2cap_chan *chan, *pchan;



	BT_DBG("");
@@ -1361,13 +1361,11 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 


	chan->dcid = L2CAP_CID_ATT;



	sk = chan->sk;



	hci_conn_hold(conn->hcon);

	conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT;



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

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

	bacpy(&bt_sk(chan->sk)->src, conn->src);

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



	l2cap_chan_add(conn, chan);