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

Commit f963e8e9 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Add address type parameter to Discovering event 



This patch adds an address type parameter to the Discovering event. The
value matches that given to Start/Stop Discovery.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d930650b

include/net/bluetooth/mgmt.h

+4 −0
Original line number Diff line number Diff line
@@ -402,6 +402,10 @@ struct mgmt_ev_device_found { 
} __packed;



#define MGMT_EV_DISCOVERING		0x0013

struct mgmt_ev_discovering {

	__u8 type;

	__u8 discovering;

} __packed;



#define MGMT_EV_DEVICE_BLOCKED		0x0014

struct mgmt_ev_device_blocked {

net/bluetooth/hci_core.c

+1 −2
Original line number Diff line number Diff line
@@ -363,10 +363,9 @@ 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);

		hdev->discovery.type = 0;

		break;

	case DISCOVERY_STARTING:

		break;

net/bluetooth/mgmt.c

+6 −2
Original line number Diff line number Diff line
@@ -3392,6 +3392,7 @@ int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status) 


int mgmt_discovering(struct hci_dev *hdev, u8 discovering)

{

	struct mgmt_ev_discovering ev;

	struct pending_cmd *cmd;



	BT_DBG("%s discovering %u", hdev->name, discovering);
@@ -3409,8 +3410,11 @@ int mgmt_discovering(struct hci_dev *hdev, u8 discovering) 
		mgmt_pending_remove(cmd);

	}



	return mgmt_event(MGMT_EV_DISCOVERING, hdev, &discovering,

						sizeof(discovering), NULL);

	memset(&ev, 0, sizeof(ev));

	ev.type = hdev->discovery.type;

	ev.discovering = discovering;



	return mgmt_event(MGMT_EV_DISCOVERING, hdev, &ev, sizeof(ev), NULL);

}



int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)