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

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

Bluetooth: Move eir_append_data function to a different location 



The eir_append_data helper function is needed for generating the
extended local OOB data fields. So move it up into the right location.

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

net/bluetooth/mgmt.c

+11 −11
Original line number Diff line number Diff line
@@ -6255,6 +6255,17 @@ static int set_public_address(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,

				  u8 data_len)

{

	eir[eir_len++] = sizeof(type) + data_len;

	eir[eir_len++] = type;

	memcpy(&eir[eir_len], data, data_len);

	eir_len += data_len;



	return eir_len;

}



static int read_adv_features(struct sock *sk, struct hci_dev *hdev,

			     void *data, u16 data_len)

{
@@ -6932,17 +6943,6 @@ void mgmt_new_conn_param(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	mgmt_event(MGMT_EV_NEW_CONN_PARAM, hdev, &ev, sizeof(ev), NULL);

}



static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,

				  u8 data_len)

{

	eir[eir_len++] = sizeof(type) + data_len;

	eir[eir_len++] = type;

	memcpy(&eir[eir_len], data, data_len);

	eir_len += data_len;



	return eir_len;

}



void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,

			   u32 flags, u8 *name, u8 name_len)

{