From: Johan Hedberg Date: Mon, 29 Apr 2013 16:35:44 +0000 (+0300) Subject: Bluetooth: Remove useless hci_conn disc_timeout setting X-Git-Tag: next-20130607~63^2~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01b27246fd821370f9457797db6a3a35a04010ef;p=karo-tx-linux.git 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 Acked-by: Marcel Holtmann Signed-off-by: Gustavo Padovan --- diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 86dece53122e..22da8d99f801 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -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);