From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:41:01 +0000 (+0800)
Subject: Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."
X-Git-Tag: firefly_0821_release~9953
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c568ed308f23b7dabebef8ef674ba5bad023183;p=firefly-linux-kernel-4.4.55.git

Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."

This reverts commit 1f39bbdd42999892f5f6ef8aeb03b3fff6d1ebd6.
---

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b6d36cbb2773..7b640aeddb64 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -358,7 +358,7 @@ static inline void hci_conn_put(struct hci_conn *conn)
 			if (conn->state == BT_CONNECTED) {
 				timeo = msecs_to_jiffies(conn->disc_timeout);
 				if (!conn->out)
-					timeo *= 20;
+					timeo *= 2;
 			} else
 				timeo = msecs_to_jiffies(10);
 		} else