Bluetooth: Track discovery type

This patch adds to struct discovery_state the field 'type' so that
we can track the discovery type the device is performing.

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 be8da5d54abba4ce8ac745269b4cd55a17aa7b1a..d7c79b5335c2fb58d988ff5233d8f0a9653d487b 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -57,6 +57,7 @@ struct inquiry_entry {
 };
 
 struct discovery_state {
+       int type;
        enum {
                DISCOVERY_STOPPED,
                DISCOVERY_STARTING,

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index dc31e7d6028e33ae1f409a52c453deaad380ae0c..29a9b01c3b9ba505f2d38340968275812198a322 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -380,6 +380,8 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
 
        switch (state) {
        case DISCOVERY_STOPPED:
+               hdev->discovery.type = 0;
+
                if (hdev->discovery.state != DISCOVERY_STARTING)
                        mgmt_discovering(hdev, 0);
                break;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 196215c9d42494b6d2836d27bf939a450c6c6666..9d98382e48c776e6a0d9953f7dfaa1fd8c95aaaf 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2192,7 +2192,9 @@ static int start_discovery(struct sock *sk, u16 index,
                goto failed;
        }
 
-       switch (cp->type) {
+       hdev->discovery.type = cp->type;
+
+       switch (hdev->discovery.type) {
        case DISCOV_TYPE_BREDR:
        case DISCOV_TYPE_INTERLEAVED:
                err = hci_do_inquiry(hdev, INQUIRY_LEN_BREDR);