diff options
| author | Johan Hedberg | 2013-04-29 18:35:44 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2013-06-23 01:23:49 +0200 |
| commit | 0cc59a72c723979cf8973aff4df874a5f7a697c7 (patch) | |
| tree | 6c4a82fa97eef9890a4582983c070bac465e84d7 /net | |
| parent | Bluetooth: Simplify hci_conn_hold/drop logic for L2CAP (diff) | |
| download | kernel-qcow2-linux-0cc59a72c723979cf8973aff4df874a5f7a697c7.tar.gz kernel-qcow2-linux-0cc59a72c723979cf8973aff4df874a5f7a697c7.tar.xz kernel-qcow2-linux-0cc59a72c723979cf8973aff4df874a5f7a697c7.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d7b501ba2716..8ae6a21cf643 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); |