Bluetooth: Rename eir_has_complete_name to eir_has_data_type

[deliverable/linux.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e13ce945afc402e5f9925553318a6f3b7ac5cd94..d256042a83cf2a55c4239dd4f0e4aaabdda340e6 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2842,7 +2842,7 @@ 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_complete_name(u8 *data, size_t data_len)
+static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
 {
        u8 field_len;
        size_t parsed;
@@ -2858,7 +2858,7 @@ static inline bool eir_has_complete_name(u8 *data, size_t data_len)
                if (parsed > data_len)
                        break;
 
-               if (data[1] == EIR_NAME_COMPLETE)
+               if (data[1] == type)
                        return true;
 
                data += field_len + 1;
@@ -2893,8 +2893,9 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
                data.ssp_mode           = 0x01;
 
                if (test_bit(HCI_MGMT, &hdev->dev_flags))
-                       name_known = eir_has_complete_name(info->data,
-                                                       sizeof(info->data));
+                       name_known = eir_has_data_type(info->data,
+                                                       sizeof(info->data),
+                                                       EIR_NAME_COMPLETE);
                else
                        name_known = true;