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

Commit 5507e358 authored by Arman Uguray's avatar Arman Uguray Committed by Marcel Holtmann
Browse files

Bluetooth: Support the "tx-power" adv flag 



This patch adds support for the "tx-power" flag of the Add
Advertising command.

Signed-off-by: default avatarArman Uguray <armansito@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 67e0c0cd

net/bluetooth/mgmt.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -1004,6 +1004,16 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 *ptr) 
		ptr += 3;

		ptr += 3;

	}

	}





	if (hdev->adv_tx_power != HCI_TX_POWER_INVALID &&

	    (hdev->adv_instance.flags & MGMT_ADV_FLAG_TX_POWER)) {

		ptr[0] = 0x02;

		ptr[1] = EIR_TX_POWER;

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



		ad_len += 3;

		ptr += 3;

	}



	memcpy(ptr, hdev->adv_instance.adv_data,

	memcpy(ptr, hdev->adv_instance.adv_data,

	       hdev->adv_instance.adv_data_len);

	       hdev->adv_instance.adv_data_len);

	ad_len += hdev->adv_instance.adv_data_len;

	ad_len += hdev->adv_instance.adv_data_len;
@@ -6588,6 +6598,7 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, 
	u8 max_len = HCI_MAX_AD_LENGTH;

	u8 max_len = HCI_MAX_AD_LENGTH;

	int i, cur_len;

	int i, cur_len;

	bool flags_managed = false;

	bool flags_managed = false;

	bool tx_power_managed = false;

	u32 flags_params = MGMT_ADV_FLAG_DISCOV | MGMT_ADV_FLAG_LIMITED_DISCOV |

	u32 flags_params = MGMT_ADV_FLAG_DISCOV | MGMT_ADV_FLAG_LIMITED_DISCOV |

			   MGMT_ADV_FLAG_MANAGED_FLAGS;

			   MGMT_ADV_FLAG_MANAGED_FLAGS;
@@ -6596,6 +6607,11 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, 
		max_len -= 3;

		max_len -= 3;

	}

	}





	if (is_adv_data && (adv_flags & MGMT_ADV_FLAG_TX_POWER)) {

		tx_power_managed = true;

		max_len -= 3;

	}



	if (len > max_len)

	if (len > max_len)

		return false;

		return false;
@@ -6606,6 +6622,9 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data, 
		if (flags_managed && data[i + 1] == EIR_FLAGS)

		if (flags_managed && data[i + 1] == EIR_FLAGS)

			return false;

			return false;





		if (tx_power_managed && data[i + 1] == EIR_TX_POWER)

			return false;



		/* If the current field length would exceed the total data

		/* If the current field length would exceed the total data

		 * length, then it's invalid.

		 * length, then it's invalid.

		 */

		 */