projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d836dba
)
Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."
author
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 14:41:01 +0000
(22:41 +0800)
committer
黄涛
<huangtao@rock-chips.com>
Sat, 30 Jul 2011 14:41:01 +0000
(22:41 +0800)
This reverts commit
1f39bbdd42999892f5f6ef8aeb03b3fff6d1ebd6
.
include/net/bluetooth/hci_core.h
patch
|
blob
|
history
diff --git
a/include/net/bluetooth/hci_core.h
b/include/net/bluetooth/hci_core.h
index b6d36cbb27731236fd2f16c04cf48ca5a0f91352..7b640aeddb64d81af0c608becdc6d88631686773 100644
(file)
--- 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 *= 2
0
;
+ timeo *= 2;
} else
timeo = msecs_to_jiffies(10);
} else