lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Handle EIR tags for Device ID

Browse Source 
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann
2012-03-11 19:32:12 -07:00
committed by Gustavo Padovan
parent 91c4e9b1ac
commit 2b9be137b7
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/hci_core.h
View File

@@ -159,6 +159,10 @@ struct hci_dev {
__u16 voice_setting; __u16 voice_setting;
__u8 io_capability; __u8 io_capability;
__s8 inq_tx_power; __s8 inq_tx_power;
__u16 devid_source;
__u16 devid_vendor;
__u16 devid_product;
__u16 devid_version;
__u16 pkt_type; __u16 pkt_type;
__u16 esco_type; __u16 esco_type;

13
net/bluetooth/mgmt.c
View File

@@ -488,6 +488,19 @@ static void create_eir(struct hci_dev *hdev, u8 *data)
ptr += 3; 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)); memset(uuid16_list, 0, sizeof(uuid16_list));
/* Group all UUID16 types */ /* Group all UUID16 types */