Bluetooth: Change LE scanning timeout macros

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

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e246d3782ac2..00dcb74954d3 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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;
 }
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 34ba1647e6e8..cd2332f6cecb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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 */