]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Remove useless hci_conn disc_timeout setting
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 29 Apr 2013 16:35:44 +0000 (19:35 +0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 19:09:44 +0000 (16:09 -0300)
There's no need to reset disc_timeout in l2cap_le_conn_ready since
HCI_DISCONN_TIMEOUT is the default when the hci_conn is created and
there should be no way for it to get changed between creation and
l2cap_le_conn_ready being called.

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 86dece53122e21a84814edeec6b5a22cc0cd6cd9..22da8d99f801bf1ae5e52e9b5d31cda80e79eee1 100644 (file)
@@ -1363,8 +1363,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
 
        chan->dcid = L2CAP_CID_ATT;
 
-       conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
-
        bacpy(&bt_sk(chan->sk)->src, conn->src);
        bacpy(&bt_sk(chan->sk)->dst, conn->dst);