projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97f57c0
)
Bluetooth: Remove useless sk variable in l2cap_le_conn_ready
author
Johan Hedberg
<johan.hedberg@intel.com>
Mon, 29 Apr 2013 16:35:41 +0000
(19:35 +0300)
committer
Gustavo Padovan
<gustavo.padovan@collabora.co.uk>
Sat, 22 Jun 2013 23:23:48 +0000
(
00:23
+0100)
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
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_core.c
b/net/bluetooth/l2cap_core.c
index 843463ecd7bc62f8651b1500af73be722a11435d..1557c3c774f1c15870a55ea4b15ac40d86378afb 100644
(file)
--- 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,
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);