Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0cc59a72c723979cf8973aff4df874a5f7a697c7

Authored by Johan Hedberg
Committed by Gustavo Padovan
1 parent 5ee9891dd8
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

net/bluetooth/l2cap_core.c
Diff comments   View file @ 0cc59a7
... ... @@ -1363,8 +1363,6 @@
1363 1363  
1364 1364 chan->dcid = L2CAP_CID_ATT;
1365 1365  
1366   - conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
1367   -
1368 1366 bacpy(&bt_sk(chan->sk)->src, conn->src);
1369 1367 bacpy(&bt_sk(chan->sk)->dst, conn->dst);
1370 1368