summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorAndre Guedes2012-02-18 00:39:36 +0100
committerJohan Hedberg2012-02-19 11:33:49 +0100
commit4aab14e5504e84c42534378f91e836e6f55d0886 (patch)
tree9378f2f0d3e345788e8853b3bb7ea2fa4d70558e /net/bluetooth/hci_core.c
parentBluetooth: Prepare start_discovery (diff)
downloadkernel-qcow2-linux-4aab14e5504e84c42534378f91e836e6f55d0886.tar.gz
kernel-qcow2-linux-4aab14e5504e84c42534378f91e836e6f55d0886.tar.xz
kernel-qcow2-linux-4aab14e5504e84c42534378f91e836e6f55d0886.zip
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>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index dc31e7d6028e..29a9b01c3b9b 100644
--- 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;