Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Andre Guedes 12 years ago
parent
d2c5d77fff
commit
b6c7515a28
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      net/bluetooth/hci_core.c
  2. 2 2
      net/bluetooth/mgmt.c

+ 1 - 1
net/bluetooth/hci_core.c
View File 

@@ -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;
 
 }

+ 2 - 2
net/bluetooth/mgmt.c
View File 

@@ -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 */