]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Remove useless sk variable in l2cap_le_conn_ready
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 29 Apr 2013 16:35:41 +0000 (19:35 +0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 19:09:43 +0000 (16:09 -0300)
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>
net/bluetooth/l2cap_core.c

index e88cbc53ace41b966fbcec52a66820dafe9664a0..6de8316c4bdf99bf94acedaf7c5a906b241226eb 100644 (file)
@@ -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);