aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-21 12:21:37 -0400
committerMarcel Holtmann <marcel@holtmann.org>2013-10-21 15:58:16 -0400
commitd42970f319f8a1d7cfe8196097f62e5b3885e449 (patch)
tree7ca053c3bf8a4afca64451f0b1b6148632e4a916 /net
parent547003b114bcb96555cf73ec7f45ab64b2dcaf67 (diff)
Bluetooth: Remove not used struct sock
It is a leftover from the recent effort of remove sk usage from L2CAP core. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d52bd0d32621..4141545c620a 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3726,7 +3726,7 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
3726 struct l2cap_conn_req *req = (struct l2cap_conn_req *) data; 3726 struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;
3727 struct l2cap_conn_rsp rsp; 3727 struct l2cap_conn_rsp rsp;
3728 struct l2cap_chan *chan = NULL, *pchan; 3728 struct l2cap_chan *chan = NULL, *pchan;
3729 struct sock *parent, *sk = NULL; 3729 struct sock *parent;
3730 int result, status = L2CAP_CS_NO_INFO; 3730 int result, status = L2CAP_CS_NO_INFO;
3731 3731
3732 u16 dcid = 0, scid = __le16_to_cpu(req->scid); 3732 u16 dcid = 0, scid = __le16_to_cpu(req->scid);
@@ -3765,8 +3765,6 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
3765 if (!chan) 3765 if (!chan)
3766 goto response; 3766 goto response;
3767 3767
3768 sk = chan->sk;
3769
3770 /* For certain devices (ex: HID mouse), support for authentication, 3768 /* For certain devices (ex: HID mouse), support for authentication,
3771 * pairing and bonding is optional. For such devices, inorder to avoid 3769 * pairing and bonding is optional. For such devices, inorder to avoid
3772 * the ACL alive for too long after L2CAP disconnection, reset the ACL 3770 * the ACL alive for too long after L2CAP disconnection, reset the ACL