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

Commit a10f27cf authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Simplify UUID16 list generation for EIR 



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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 056341c8

net/bluetooth/mgmt.c

+15 −31
Original line number Diff line number Diff line
@@ -438,9 +438,8 @@ static u32 get_current_settings(struct hci_dev *hdev) 
static void create_eir(struct hci_dev *hdev, u8 *data)

{

	u8 *ptr = data;

	u8 *uuids_start;

	u16 eir_len = 0;

	u16 uuid16_list[HCI_MAX_EIR_LENGTH / sizeof(u16)];

	int i, truncated = 0;

	struct bt_uuid *uuid;

	size_t name_len;
@@ -485,7 +484,7 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
		ptr += 10;

	}



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

	uuids_start = NULL;



	/* Group all UUID16 types */

	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)

			continue;



		/* Stop if not enough space to put next UUID */

		if (eir_len + 2 + sizeof(u16) > HCI_MAX_EIR_LENGTH) {

			truncated = 1;

			break;

		}



		/* Check for duplicates */

		for (i = 0; uuid16_list[i] != 0; i++)

			if (uuid16_list[i] == uuid16)

				break;



		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;



		if (!uuids_start) {

			uuids_start = ptr;

			uuids_start[0] = 1;

			uuids_start[1] = 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;

		/* Stop if not enough space to put next UUID */

		if (eir_len + 2 + sizeof(u16) > HCI_MAX_EIR_LENGTH) {

			uuids_start[1] = EIR_UUID16_SOME;

			break;

		}



		/* EIR Data length */

		*length = (i * sizeof(u16)) + 1;

		*ptr++ = (uuid16 & 0x00ff);

		*ptr++ = (uuid16 & 0xff00) >> 8;

		eir_len += sizeof(uuid16);

		uuids_start[0] += sizeof(uuid16);

	}

}