Bluetooth: Prepare start_discovery

This patch does some code refactoring in start_discovery function
in order to prepare it for interleaved discovery support.

MGMT_ADDR_* macros were moved to hci_core.h since they are now used
to define discovery type macros.

Discovery type macros were defined according to mgmt-api.txt
specification:

Possible values for the Type parameter are a bit-wise or of the
following bits:

	1	BR/EDR
	2	LE Public
	3	LE Random

By combining these e.g. the following values are possible:

	1	BR/EDR
	6	LE (public & random)
	7	BR/EDR/LE (interleaved discovery)

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f9f3e4c44150..196215c9d424 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2157,7 +2157,6 @@ static int start_discovery(struct sock *sk, u16 index,
                                                 void *data, u16 len)
 {
         struct mgmt_cp_start_discovery *cp = data;
-        unsigned long discov_type = cp->type;
         struct pending_cmd *cmd;
         struct hci_dev *hdev;
         int err;
@@ -2193,14 +2192,20 @@ static int start_discovery(struct sock *sk, u16 index,
                 goto failed;
         }
 
-        if (test_bit(MGMT_ADDR_BREDR, &discov_type))
+        switch (cp->type) {
+        case DISCOV_TYPE_BREDR:
+        case DISCOV_TYPE_INTERLEAVED:
                 err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);
-        else if (test_bit(MGMT_ADDR_LE_PUBLIC, &discov_type) &&
-                                test_bit(MGMT_ADDR_LE_RANDOM, &discov_type))
+                break;
+
+        case DISCOV_TYPE_LE:
                 err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
                                         LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY);
-        else
+                break;
+
+        default:
                 err = -EINVAL;
+        }
 
         if (err < 0)
                 mgmt_pending_remove(cmd);