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

Commit 38c8af60 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix location of TX power field in LE advertising data 



The TX power field in the LE advertising data should be placed last
since it needs to be possible to enable kernel controlled TX power,
but still allow for userspace provided flags field.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent fd6413d8

net/bluetooth/mgmt.c

+8 −6
Original line number Diff line number Diff line
@@ -1043,6 +1043,14 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) 
		}

	}



	if (instance) {

		memcpy(ptr, hdev->adv_instance.adv_data,

		       hdev->adv_instance.adv_data_len);



		ad_len += hdev->adv_instance.adv_data_len;

		ptr += hdev->adv_instance.adv_data_len;

	}



	/* Provide Tx Power only if we can provide a valid value for it */

	if (hdev->adv_tx_power != HCI_TX_POWER_INVALID &&

	    (instance_flags & MGMT_ADV_FLAG_TX_POWER)) {
@@ -1054,12 +1062,6 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) 
		ptr += 3;

	}



	if (instance) {

		memcpy(ptr, hdev->adv_instance.adv_data,

		       hdev->adv_instance.adv_data_len);

		ad_len += hdev->adv_instance.adv_data_len;

	}



	return ad_len;

}