Commit 31aab5c2 authored by Daniel Winkler's avatar Daniel Winkler Committed by Johan Hedberg
Browse files

Bluetooth: Add helper to set adv data 



We wish to handle advertising data separately from advertising
parameters in our new MGMT requests. This change adds a helper that
allows the advertising data and scan response to be updated for an
existing advertising instance.

Reviewed-by: default avatarSonny Sasaka <sonnysasaka@chromium.org>
Signed-off-by: default avatarDaniel Winkler <danielwinkler@google.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent ef2862a1

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,9 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, 
			 u16 adv_data_len, u8 *adv_data,

			 u16 scan_rsp_len, u8 *scan_rsp_data,

			 u16 timeout, u16 duration);

int hci_set_adv_instance_data(struct hci_dev *hdev, u8 instance,

			 u16 adv_data_len, u8 *adv_data,

			 u16 scan_rsp_len, u8 *scan_rsp_data);

int hci_remove_adv_instance(struct hci_dev *hdev, u8 instance);

void hci_adv_instances_set_rpa_expired(struct hci_dev *hdev, bool rpa_expired);

net/bluetooth/hci_core.c

+31 −0
Original line number Diff line number Diff line
@@ -3005,6 +3005,37 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, 
	return 0;

}



/* This function requires the caller holds hdev->lock */

int hci_set_adv_instance_data(struct hci_dev *hdev, u8 instance,

			      u16 adv_data_len, u8 *adv_data,

			      u16 scan_rsp_len, u8 *scan_rsp_data)

{

	struct adv_info *adv_instance;



	adv_instance = hci_find_adv_instance(hdev, instance);



	/* If advertisement doesn't exist, we can't modify its data */

	if (!adv_instance)

		return -ENOENT;



	if (adv_data_len) {

		memset(adv_instance->adv_data, 0,

		       sizeof(adv_instance->adv_data));

		memcpy(adv_instance->adv_data, adv_data, adv_data_len);

		adv_instance->adv_data_len = adv_data_len;

	}



	if (scan_rsp_len) {

		memset(adv_instance->scan_rsp_data, 0,

		       sizeof(adv_instance->scan_rsp_data));

		memcpy(adv_instance->scan_rsp_data,

		       scan_rsp_data, scan_rsp_len);

		adv_instance->scan_rsp_len = scan_rsp_len;

	}



	return 0;

}



/* This function requires the caller holds hdev->lock */

void hci_adv_monitors_clear(struct hci_dev *hdev)

{