Commit 6759a675 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: Move eir_has_data_field to hci_core.h 



This makes the function accessible from all places it's needed (e.g.
mgmt.c and hci_event.c).

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

include/net/bluetooth/hci_core.h

+25 −0
Original line number Diff line number Diff line
@@ -868,6 +868,31 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status, 
	read_unlock(&hci_cb_list_lock);

}



static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)

{

	u8 field_len;

	size_t parsed;



	for (parsed = 0; parsed < data_len - 1; parsed += field_len) {

		field_len = data[0];



		if (field_len == 0)

			break;



		parsed += field_len + 1;



		if (parsed > data_len)

			break;



		if (data[1] == type)

			return true;



		data += field_len + 1;

	}



	return false;

}



int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);

net/bluetooth/hci_event.c

+0 −25
Original line number Diff line number Diff line
@@ -2842,31 +2842,6 @@ static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *s 
	BT_DBG("%s status %d", hdev->name, ev->status);

}



static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)

{

	u8 field_len;

	size_t parsed;



	for (parsed = 0; parsed < data_len - 1; parsed += field_len) {

		field_len = data[0];



		if (field_len == 0)

			break;



		parsed += field_len + 1;



		if (parsed > data_len)

			break;



		if (data[1] == type)

			return true;



		data += field_len + 1;

	}



	return false;

}



static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct inquiry_data data;