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

Commit 2b9be137 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Handle EIR tags for Device ID 



The Device ID information can be provided via Extended Inquiry Data
as well. If a valid source is present, then include it.

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

include/net/bluetooth/hci_core.h

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ struct hci_dev { 
	__u16		voice_setting;

	__u8		io_capability;

	__s8		inq_tx_power;

	__u16		devid_source;

	__u16		devid_vendor;

	__u16		devid_product;

	__u16		devid_version;



	__u16		pkt_type;

	__u16		esco_type;

net/bluetooth/mgmt.c

+13 −0
Original line number Diff line number Diff line
@@ -488,6 +488,19 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
		ptr += 3;

	}



	if (hdev->devid_source > 0) {

		ptr[0] = 9;

		ptr[1] = EIR_DEVICE_ID;



		put_unaligned_le16(hdev->devid_source, ptr + 2);

		put_unaligned_le16(hdev->devid_vendor, ptr + 4);

		put_unaligned_le16(hdev->devid_product, ptr + 6);

		put_unaligned_le16(hdev->devid_version, ptr + 8);



		eir_len += 10;

		ptr += 10;

	}



	memset(uuid16_list, 0, sizeof(uuid16_list));



	/* Group all UUID16 types */