summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2012-03-15 20:52:08 +0100
committerGustavo Padovan <gustavo@padovan.org>2012-05-09 05:41:33 +0200
commitc9ecc48e2f3577a73dcd830d8b67ecc48e224465 (patch)
tree8aafa2620851fda2235b11fa6c8c98e38ab709bc /net/bluetooth/mgmt.c
parentBluetooth: Add hci_cancel_le_scan() to hci_core (diff)
downloadlinux-c9ecc48e2f3577a73dcd830d8b67ecc48e224465.tar.xz
linux-c9ecc48e2f3577a73dcd830d8b67ecc48e224465.zip
Bluetooth: LE support for MGMT stop discovery
This patch adds LE support to MGMT stop discovery command. So, now we are able to cancel LE discovery procedures (LE-only and interleaved). 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/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0ef4b6ca6e44..5fc741bab2bf 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2404,7 +2404,11 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data,
}
if (hdev->discovery.state == DISCOVERY_FINDING) {
- err = hci_cancel_inquiry(hdev);
+ if (test_bit(HCI_INQUIRY, &hdev->flags))
+ err = hci_cancel_inquiry(hdev);
+ else
+ err = hci_cancel_le_scan(hdev);
+
if (err < 0)
mgmt_pending_remove(cmd);
else