Commit 0cc59a72 authored Apr 29, 2013 by Johan Hedberg Committed by Gustavo Padovan Jun 23, 2013

Bluetooth: Remove useless hci_conn disc_timeout setting



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>

parent 5ee9891d

net/bluetooth/l2cap_core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);