aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-04-29 12:35:41 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-22 19:23:48 -0400
commit60bac184c9c7df2299aca4dc45c4b5b486f49a89 (patch)
tree8bc8c47d3a75051143beea64d9df3ad1f915dec2 /net/bluetooth
parent97f57c0b14ad2ef0628fc6db48cd6c08e0e52c50 (diff)
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: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 843463ecd7bc..1557c3c774f1 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1340,7 +1340,7 @@ static struct l2cap_chan *l2cap_global_chan_by_scid(int state, u16 cid,
1340 1340
1341static void l2cap_le_conn_ready(struct l2cap_conn *conn) 1341static void l2cap_le_conn_ready(struct l2cap_conn *conn)
1342{ 1342{
1343 struct sock *parent, *sk; 1343 struct sock *parent;
1344 struct l2cap_chan *chan, *pchan; 1344 struct l2cap_chan *chan, *pchan;
1345 1345
1346 BT_DBG(""); 1346 BT_DBG("");
@@ -1361,13 +1361,11 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
1361 1361
1362 chan->dcid = L2CAP_CID_ATT; 1362 chan->dcid = L2CAP_CID_ATT;
1363 1363
1364 sk = chan->sk;
1365
1366 hci_conn_hold(conn->hcon); 1364 hci_conn_hold(conn->hcon);
1367 conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT; 1365 conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
1368 1366
1369 bacpy(&bt_sk(sk)->src, conn->src); 1367 bacpy(&bt_sk(chan->sk)->src, conn->src);
1370 bacpy(&bt_sk(sk)->dst, conn->dst); 1368 bacpy(&bt_sk(chan->sk)->dst, conn->dst);
1371 1369
1372 l2cap_chan_add(conn, chan); 1370 l2cap_chan_add(conn, chan);
1373 1371