summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLukasz Rymanowski <lukasz.rymanowski@tieto.com>2014-03-27 20:55:19 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-03-28 00:09:30 -0700
commitae55f5982a8bc6adbafb337e0b781d30d5617782 (patch)
treec1180fde026509028d3c5d5723415c20465e601f /include/net
parent8af4840a36f3d8210604ecfd5b1ce9b39745e7ba (diff)
downloadlinux-stable-ae55f5982a8bc6adbafb337e0b781d30d5617782.tar.gz
linux-stable-ae55f5982a8bc6adbafb337e0b781d30d5617782.tar.bz2
linux-stable-ae55f5982a8bc6adbafb337e0b781d30d5617782.zip
Bluetooth: Keep msec in DISCOV_INTERLEAVED_TIMEOUT
Keep msec instead of jiffies in this define. This is needed by following patch where we want this timeout to be exposed in debugfs. Note: Value of this timeout comes from recommendation in BT Core Spec.4.0, Vol 3, Part C, chapter 13.2.1. Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net')
-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 c2a419c2c5c7..08a1d44eeab0 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1210,7 +1210,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);
#define DISCOV_LE_SCAN_WIN 0x12
#define DISCOV_LE_SCAN_INT 0x12
#define DISCOV_LE_TIMEOUT msecs_to_jiffies(10240)
-#define DISCOV_INTERLEAVED_TIMEOUT msecs_to_jiffies(5120)
+#define DISCOV_INTERLEAVED_TIMEOUT 5120 /* msec */
#define DISCOV_INTERLEAVED_INQUIRY_LEN 0x04
#define DISCOV_BREDR_INQUIRY_LEN 0x08