Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6c7515a authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Change LE scanning timeout macros 



Define LE scanning timeout macros in jiffies just like we do for
others timeout macros.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent d2c5d77f

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2024,7 +2024,7 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval, 
		return err;



	queue_delayed_work(hdev->workqueue, &hdev->le_scan_disable,

			   msecs_to_jiffies(timeout));

			   timeout);



	return 0;

}

net/bluetooth/mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static const u16 mgmt_events[] = { 
#define LE_SCAN_TYPE			0x01

#define LE_SCAN_WIN			0x12

#define LE_SCAN_INT			0x12

#define LE_SCAN_TIMEOUT_LE_ONLY		10240	/* TGAP(gen_disc_scan_min) */

#define LE_SCAN_TIMEOUT_BREDR_LE	5120	/* TGAP(100)/2 */

#define LE_SCAN_TIMEOUT_LE_ONLY		msecs_to_jiffies(10240)

#define LE_SCAN_TIMEOUT_BREDR_LE	msecs_to_jiffies(5120)



#define INQUIRY_LEN_BREDR		0x08	/* TGAP(100) */

#define INQUIRY_LEN_BREDR_LE		0x04	/* TGAP(100)/2 */