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

Commit c599008f authored by Andre Guedes's avatar Andre Guedes Committed by Johan Hedberg
Browse files

Bluetooth: LE scan should send Discovering events 



Send MGMT Discovering events once LE scan starts/stops so the
userspace can track when local adapters are discovering LE devices.

This way, we also keep the same behavior of inquiry which sends MGMT
Discovering events once inquiry starts/stops even if it is triggered
by an external tool (e.g. hcitool).

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 8af59467

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct discovery_state { 
		DISCOVERY_STOPPED,

		DISCOVERY_STARTING,

		DISCOVERY_INQUIRY,

		DISCOVERY_LE_SCAN,

		DISCOVERY_RESOLVING,

		DISCOVERY_STOPPING,

	} state;

net/bluetooth/hci_core.c

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ bool hci_discovery_active(struct hci_dev *hdev) 
	struct discovery_state *discov = &hdev->discovery;



	if (discov->state == DISCOVERY_INQUIRY ||

					discov->state == DISCOVERY_LE_SCAN ||

					discov->state == DISCOVERY_RESOLVING)

		return true;
@@ -381,6 +382,7 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) 
	case DISCOVERY_STARTING:

		break;

	case DISCOVERY_INQUIRY:

	case DISCOVERY_LE_SCAN:

		mgmt_discovering(hdev, 1);

		break;

	case DISCOVERY_RESOLVING:

net/bluetooth/hci_event.c

+5 −0
Original line number Diff line number Diff line
@@ -1056,12 +1056,17 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 


		hci_dev_lock(hdev);

		hci_adv_entries_clear(hdev);

		hci_discovery_set_state(hdev, DISCOVERY_LE_SCAN);

		hci_dev_unlock(hdev);

		break;



	case LE_SCANNING_DISABLED:

		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);



		hci_dev_lock(hdev);

		hci_discovery_set_state(hdev, DISCOVERY_STOPPED);

		hci_dev_unlock(hdev);



		schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT);

		break;