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

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

Bluetooth: Remove useless eir_len variable from EIR creation 



The amount of data encoded so far in the create_eir() function can be
calculated simply through the difference between the data and ptr
pointer variables. The eir_len variable then becomes essentially
useless.

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 a10f27cf

net/bluetooth/mgmt.c

+1 −7
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
{

	u8 *ptr = data;

	u8 *uuids_start;

	u16 eir_len = 0;

	struct bt_uuid *uuid;

	size_t name_len;
@@ -458,7 +457,6 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 


		memcpy(ptr + 2, hdev->dev_name, name_len);



		eir_len += (name_len + 2);

		ptr += (name_len + 2);

	}
@@ -467,7 +465,6 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
		ptr[1] = EIR_TX_POWER;

		ptr[2] = (u8) hdev->inq_tx_power;



		eir_len += 3;

		ptr += 3;

	}
@@ -480,7 +477,6 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
		put_unaligned_le16(hdev->devid_product, ptr + 6);

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



		eir_len += 10;

		ptr += 10;

	}
@@ -505,18 +501,16 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
			uuids_start[0] = 1;

			uuids_start[1] = EIR_UUID16_ALL;

			ptr += 2;

			eir_len += 2;

		}



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

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

		if ((ptr - data) + 2 + sizeof(u16) > HCI_MAX_EIR_LENGTH) {

			uuids_start[1] = EIR_UUID16_SOME;

			break;

		}



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

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

		eir_len += sizeof(uuid16);

		uuids_start[0] += sizeof(uuid16);

	}

}