kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: Simplify UUID16 list generation for EIR

Browse source 
There's no need to use two separate loops to generate a UUID list for
the EIR data. This patch merges the two loops previously used for the
16-bit UUID list generation into a single loop, thus simplifying the
code a great deal.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Johan Hedberg 2013-01-27 00:31:31 +02:00 committed by Gustavo Padovan
parent 056341c8cb
commit a10f27cf42
1 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
net/bluetooth/mgmt.c
View file

@ -438,9 +438,8 @@ static u32 get_current_settings(struct hci_dev *hdev)
static void create_eir(struct hci_dev *hdev, u8 *data) static void create_eir(struct hci_dev *hdev, u8 *data)
{ {
u8 *ptr = data; u8 *ptr = data;
u8 *uuids_start;
u16 eir_len = 0; u16 eir_len = 0;
u16 uuid16_list[HCI_MAX_EIR_LENGTH / sizeof(u16)];
int i, truncated = 0;
struct bt_uuid *uuid; struct bt_uuid *uuid;
size_t name_len; size_t name_len;
@ -485,7 +484,7 @@ static void create_eir(struct hci_dev *hdev, u8 *data)
ptr += 10; ptr += 10;
} }
memset(uuid16_list, 0, sizeof(uuid16_list)); uuids_start = NULL;
/* Group all UUID16 types */ /* Group all UUID16 types */
list_for_each_entry(uuid, &hdev->uuids, list) { list_for_each_entry(uuid, &hdev->uuids, list) {
@ -501,39 +500,24 @@ static void create_eir(struct hci_dev *hdev, u8 *data)
if (uuid16 == PNP_INFO_SVCLASS_ID) if (uuid16 == PNP_INFO_SVCLASS_ID)
continue; continue;
if (!uuids_start) {
uuids_start = ptr;
uuids_start[0] = 1;
uuids_start[1] = EIR_UUID16_ALL;
ptr += 2;
eir_len += 2;
}
/* Stop if not enough space to put next UUID */ /* Stop if not enough space to put next UUID */
if (eir_len + 2 + sizeof(u16) > HCI_MAX_EIR_LENGTH) { if (eir_len + 2 + sizeof(u16) > HCI_MAX_EIR_LENGTH) {
truncated = 1; uuids_start[1] = EIR_UUID16_SOME;
break; break;
} }
/* Check for duplicates */ *ptr++ = (uuid16 & 0x00ff);
for (i = 0; uuid16_list[i] != 0; i++) *ptr++ = (uuid16 & 0xff00) >> 8;
if (uuid16_list[i] == uuid16) eir_len += sizeof(uuid16);
break; uuids_start[0] += sizeof(uuid16);
if (uuid16_list[i] == 0) {
uuid16_list[i] = uuid16;
eir_len += sizeof(u16);
}
}
if (uuid16_list[0] != 0) {
u8 *length = ptr;
/* EIR Data type */
ptr[1] = truncated ? EIR_UUID16_SOME : EIR_UUID16_ALL;
ptr += 2;
eir_len += 2;
for (i = 0; uuid16_list[i] != 0; i++) {
*ptr++ = (uuid16_list[i] & 0x00ff);
*ptr++ = (uuid16_list[i] & 0xff00) >> 8;
}
/* EIR Data length */
*length = (i * sizeof(u16)) + 1;
} }
} }