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

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

Bluetooth: Move eir_get_length() function into hci_event.c 



The eir_get_length() function is only used from hci_event.c and so
instead of having a public function move it to the location where
it is used.

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

include/net/bluetooth/hci_core.h

+0 −17
Original line number Diff line number Diff line
@@ -1009,23 +1009,6 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type) 
	return false;

}



static inline size_t eir_get_length(u8 *eir, size_t eir_len)

{

	size_t parsed = 0;



	while (parsed < eir_len) {

		u8 field_len = eir[0];



		if (field_len == 0)

			return parsed;



		parsed += field_len + 1;

		eir += field_len + 1;

	}



	return eir_len;

}



int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);

net/bluetooth/hci_event.c

+17 −0
Original line number Diff line number Diff line
@@ -2928,6 +2928,23 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, 
	hci_dev_unlock(hdev);

}



static inline size_t eir_get_length(u8 *eir, size_t eir_len)

{

	size_t parsed = 0;



	while (parsed < eir_len) {

		u8 field_len = eir[0];



		if (field_len == 0)

			return parsed;



		parsed += field_len + 1;

		eir += field_len + 1;

	}



	return eir_len;

}



static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{