diff options
| author | Vinicius Costa Gomes | 2011-08-20 02:06:52 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-09-21 17:58:11 +0200 |
| commit | 454d48ff70c24930c6b0f9cb64f290fca2dfb271 (patch) | |
| tree | c4972b1350ee2b4a603b043f013a26bbee9d0527 /include/net/bluetooth/hci_core.h | |
| parent | Bluetooth: Add a flag to indicate that SMP is going on (diff) | |
| download | kernel-qcow2-linux-454d48ff70c24930c6b0f9cb64f290fca2dfb271.tar.gz kernel-qcow2-linux-454d48ff70c24930c6b0f9cb64f290fca2dfb271.tar.xz kernel-qcow2-linux-454d48ff70c24930c6b0f9cb64f290fca2dfb271.zip | |
Bluetooth: Use the same timeouts for both ACL and LE links
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 605829b2c63e..88566f2e0a6f 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -492,7 +492,7 @@ static inline void hci_conn_put(struct hci_conn *conn) { if (atomic_dec_and_test(&conn->refcnt)) { unsigned long timeo; - if (conn->type == ACL_LINK) { + if (conn->type == ACL_LINK || conn->type == LE_LINK) { del_timer(&conn->idle_timer); if (conn->state == BT_CONNECTED) { timeo = msecs_to_jiffies(conn->disc_timeout); |