commit 454d48ff70c24930c6b0f9cb64f290fca2dfb271
author Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Fri Aug 19 21:06:52 2011 -0300
committer Gustavo F. Padovan <padovan@profusion.mobi> Wed Sep 21 12:58:11 2011 -0300
tree c4972b1350ee2b4a603b043f013a26bbee9d0527
parent d26a23454813908a1bf0e2fd8c73233b22c6dbd7

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>

include/net/bluetooth/hci_core.h

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 605829b..88566f2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -492,7 +492,7 @@
 {
 	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);