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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 33dff8ef2e085b2acfc2394d90e54dda892e718c..393bb73fc999a469ac992317765f78b6981788b6 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -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);
 

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d256042a83cf2a55c4239dd4f0e4aaabdda340e6..e93afebdcf84be90b837d2622532ca5c7709056c 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;