summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 19:31:12 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-15 20:28:38 +0200
commitefdcf8e3d716730d2212dfd973571a0ed00c9b10 (patch)
tree17b3ba516a150a5b35580d1138c4612d0d6e60ff /net
parentBluetooth: Move eir_append_data() function into mgmt.c (diff)
downloadlinux-efdcf8e3d716730d2212dfd973571a0ed00c9b10.tar.xz
linux-efdcf8e3d716730d2212dfd973571a0ed00c9b10.zip
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: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 071c0df118d5..7450626b7704 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2928,6 +2928,23 @@ unlock:
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)
{