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>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 541c88d3b3f01fddde1915a933e2bc70d7a8cd68..04d39f410485a881f7afed3371a071aa2e89f838 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1095,8 +1095,12 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
                break;
 
        case LE_SCANNING_DISABLED:
-               if (status)
+               if (status) {
+                       hci_dev_lock(hdev);
+                       mgmt_stop_discovery_failed(hdev, status);
+                       hci_dev_unlock(hdev);
                        return;
+               }
 
                clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
 

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 212b8a49fcb652b8e5a4435fe68a05ca4badc160..b570eb7634c9db77f347f7c269b1e8e97e18a722 100644 (file)
--- 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