summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorLukasz Rymanowski <lukasz.rymanowski@tieto.com>2014-03-27 20:55:21 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-03-28 00:09:30 -0700
commit3d5a76f08bbac55305da87f4c810279189f64297 (patch)
tree43da597376223f70e02e2c2d243adbb1b7bbb53f /net/bluetooth
parentb9a7a61e5c3e2f6316c2aedf4ca171bdee7a4804 (diff)
downloadlinux-stable-3d5a76f08bbac55305da87f4c810279189f64297.tar.gz
linux-stable-3d5a76f08bbac55305da87f4c810279189f64297.tar.bz2
linux-stable-3d5a76f08bbac55305da87f4c810279189f64297.zip
Bluetooth: Keep msec in DISCOV_LE_TIMEOUT
To be consistent, lets use msec for this timeout as well. Note: This define value is a minimum scan time taken from BT Core spec 4.0, Vol 3, Part C, chapter 9.2.6 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b34e13aed51c..11cb00a2befb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3368,7 +3368,7 @@ static void start_discovery_complete(struct hci_dev *hdev, u8 status)
switch (hdev->discovery.type) {
case DISCOV_TYPE_LE:
- timeout = DISCOV_LE_TIMEOUT;
+ timeout = msecs_to_jiffies(DISCOV_LE_TIMEOUT);
break;
case DISCOV_TYPE_INTERLEAVED: