Skip to content

Commit

Permalink
Bluetooth: Move eir_has_data_field to hci_core.h
Browse files Browse the repository at this point in the history
This makes the function accessible from all places it's needed (e.g.
mgmt.c and hci_event.c).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg committed Feb 13, 2012
1 parent 9ec9fc8 commit 6759a67
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
25 changes: 25 additions & 0 deletions include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
25 changes: 0 additions & 25 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6759a67

Please sign in to comment.