diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-06-11 04:13:07 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-11 23:07:05 -0400 |
commit | 5f246e890502fed387e0f959e2224ea680c03423 (patch) | |
tree | c53a010ed567f5780b96f22637e32a40a2372f67 /include/net/bluetooth/hci_core.h | |
parent | 975b91bb17e70c0dc33ad07f16097106a9c2c6a2 (diff) |
Bluetooth: Update HCI timeouts constants to use msecs_to_jiffies
The HCI constants are always used in form of jiffies. So just
include the conversion from msecs in the define itself. This has the
advantage of making the code where the timeout is used more readable
and avoiding unnecessary conversions.
The patch is similar to commit ba13ccd9 doing the same job for L2CAP
Reported-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
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 20fd57367ddc..75766b7f0dc7 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -598,7 +598,7 @@ static inline void hci_conn_put(struct hci_conn *conn) | |||
598 | if (conn->type == ACL_LINK || conn->type == LE_LINK) { | 598 | if (conn->type == ACL_LINK || conn->type == LE_LINK) { |
599 | del_timer(&conn->idle_timer); | 599 | del_timer(&conn->idle_timer); |
600 | if (conn->state == BT_CONNECTED) { | 600 | if (conn->state == BT_CONNECTED) { |
601 | timeo = msecs_to_jiffies(conn->disc_timeout); | 601 | timeo = conn->disc_timeout; |
602 | if (!conn->out) | 602 | if (!conn->out) |
603 | timeo *= 2; | 603 | timeo *= 2; |
604 | } else { | 604 | } else { |