Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ecc48e authored Mar 15, 2012 by Andre Guedes Committed by Gustavo Padovan May 09, 2012

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>

parent 7dbfac1d

net/bluetooth/hci_event.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1094,8 +1094,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);

net/bluetooth/mgmt.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2404,7 +2404,11 @@ static int stop_discovery(struct sock sk, struct hci_dev hdev, void *data,
		}

		if (hdev->discovery.state == DISCOVERY_FINDING) {
		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