Commit 3d5a76f0 authored Mar 27, 2014 by Lukasz Rymanowski Committed by Marcel Holtmann Mar 28, 2014

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>

parent b9a7a61e

include/net/bluetooth/hci_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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_LE_TIMEOUT 10240 /* msec */
		#define DISCOV_INTERLEAVED_TIMEOUT 5120 /* msec */
		#define DISCOV_INTERLEAVED_INQUIRY_LEN 0x04
		#define DISCOV_BREDR_INQUIRY_LEN 0x08

net/bluetooth/mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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: