Bluetooth: Add LE scan type macros

This patch adds macros for active and passive LE scan type values.
The LE_SCAN_PASSIVE was also defined since it will be used in future
by LE connection routine and GAP Observer Role support.

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>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b3308927a0a1b1b6aca6bb4b0483f797e414c673..3f4266b3c3ba3f6cd7692f9c13fa7d398d63fe06 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -984,6 +984,9 @@ struct hci_cp_le_set_adv_data {
 
 #define HCI_OP_LE_SET_ADV_ENABLE       0x200a
 
+#define LE_SCAN_PASSIVE                        0x00
+#define LE_SCAN_ACTIVE                 0x01
+
 #define HCI_OP_LE_SET_SCAN_PARAM       0x200b
 struct hci_cp_le_set_scan_param {
        __u8    type;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cd2332f6cecb74c862c1c370a60bf5843a0f7345..4c830c62ef7412a8b4888b7a775b68117591240a 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -106,7 +106,6 @@ static const u16 mgmt_events[] = {
  * These LE scan and inquiry parameters were chosen according to LE General
  * Discovery Procedure specification.
  */
-#define LE_SCAN_TYPE                   0x01
 #define LE_SCAN_WIN                    0x12
 #define LE_SCAN_INT                    0x12
 #define LE_SCAN_TIMEOUT_LE_ONLY                msecs_to_jiffies(10240)
@@ -2703,7 +2702,7 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                        goto failed;
                }
 
-               err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
+               err = hci_le_scan(hdev, LE_SCAN_ACTIVE, LE_SCAN_INT,
                                  LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY);
                break;
 
@@ -2715,8 +2714,8 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                        goto failed;
                }
 
-               err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT, LE_SCAN_WIN,
-                                 LE_SCAN_TIMEOUT_BREDR_LE);
+               err = hci_le_scan(hdev, LE_SCAN_ACTIVE, LE_SCAN_INT,
+                                 LE_SCAN_WIN, LE_SCAN_TIMEOUT_BREDR_LE);
                break;
 
        default: