summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2011-08-19 20:06:52 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-09-21 11:58:11 -0400
commit454d48ff70c24930c6b0f9cb64f290fca2dfb271 (patch)
treec4972b1350ee2b4a603b043f013a26bbee9d0527 /include
parentd26a23454813908a1bf0e2fd8c73233b22c6dbd7 (diff)
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')
-rw-r--r--include/net/bluetooth/hci_core.h2
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)
492{ 492{
493 if (atomic_dec_and_test(&conn->refcnt)) { 493 if (atomic_dec_and_test(&conn->refcnt)) {
494 unsigned long timeo; 494 unsigned long timeo;
495 if (conn->type == ACL_LINK) { 495 if (conn->type == ACL_LINK || conn->type == LE_LINK) {
496 del_timer(&conn->idle_timer); 496 del_timer(&conn->idle_timer);
497 if (conn->state == BT_CONNECTED) { 497 if (conn->state == BT_CONNECTED) {
498 timeo = msecs_to_jiffies(conn->disc_timeout); 498 timeo = msecs_to_jiffies(conn->disc_timeout);