Bluetooth: Merge INQUIRY and LE_SCAN discovery states

This patch merges DISCOVERY_INQUIRY and DISCOVERY_LE_SCAN states
into a new state called DISCOVERY_FINDING.

From the discovery perspective, we are pretty much worried about
to know just if we are finding devices than what exactly phase of
"finding devices" (inquiry or LE scan) we are currently running.
Besides, to know if the controller is performing inquiry or LE scan
we should check HCI_INQUIRY or HCI_LE_SCAN bits in hdev flags.

Moreover, merging this two states will simplify the discovery state
machine and will keep interleaved discovery implementation simpler.

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>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d7c79b5335c2fb58d988ff5233d8f0a9653d487b..942de7764278d355d7460f4a173ed2547f03ec01 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -61,8 +61,7 @@ struct discovery_state {
        enum {
                DISCOVERY_STOPPED,
                DISCOVERY_STARTING,
-               DISCOVERY_INQUIRY,
-               DISCOVERY_LE_SCAN,
+               DISCOVERY_FINDING,
                DISCOVERY_RESOLVING,
                DISCOVERY_STOPPING,
        } state;

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 29a9b01c3b9ba505f2d38340968275812198a322..fabca080ae704994b720ae9f33d01c5cad7d9c42 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -361,8 +361,7 @@ bool hci_discovery_active(struct hci_dev *hdev)
        struct discovery_state *discov = &hdev->discovery;
 
        switch (discov->state) {
-       case DISCOVERY_INQUIRY:
-       case DISCOVERY_LE_SCAN:
+       case DISCOVERY_FINDING:
        case DISCOVERY_RESOLVING:
                return true;
 
@@ -387,8 +386,7 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
                break;
        case DISCOVERY_STARTING:
                break;
-       case DISCOVERY_INQUIRY:
-       case DISCOVERY_LE_SCAN:
+       case DISCOVERY_FINDING:
                mgmt_discovering(hdev, 1);
                break;
        case DISCOVERY_RESOLVING:

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 179d127601fce62e642a5db4de118dd1478b1972..9aea7b898821de62c073bb8b8340cc8728ff4ca1 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1080,7 +1080,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
 
                hci_dev_lock(hdev);
                hci_adv_entries_clear(hdev);
-               hci_discovery_set_state(hdev, DISCOVERY_LE_SCAN);
+               hci_discovery_set_state(hdev, DISCOVERY_FINDING);
                hci_dev_unlock(hdev);
                break;
 
@@ -1159,7 +1159,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
        set_bit(HCI_INQUIRY, &hdev->flags);
 
        hci_dev_lock(hdev);
-       hci_discovery_set_state(hdev, DISCOVERY_INQUIRY);
+       hci_discovery_set_state(hdev, DISCOVERY_FINDING);
        hci_dev_unlock(hdev);
 }
 
@@ -1645,7 +1645,7 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff
 
        hci_dev_lock(hdev);
 
-       if (discov->state != DISCOVERY_INQUIRY)
+       if (discov->state != DISCOVERY_FINDING)
                goto unlock;
 
        if (list_empty(&discov->resolve)) {

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 9d98382e48c776e6a0d9953f7dfaa1fd8c95aaaf..a9cd38dc2cab2f11962c2e598f058f13c53a002c 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2250,7 +2250,7 @@ static int stop_discovery(struct sock *sk, u16 index)
                goto unlock;
        }
 
-       if (hdev->discovery.state == DISCOVERY_INQUIRY) {
+       if (hdev->discovery.state == DISCOVERY_FINDING) {
                err = hci_cancel_inquiry(hdev);
                if (err < 0)
                        mgmt_pending_remove(cmd);