|
@@ -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);
|
|
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;
|
|
u8 field_len;
|
|
size_t parsed;
|
|
size_t parsed;
|
|
@@ -2858,7 +2858,7 @@ static inline bool eir_has_complete_name(u8 *data, size_t data_len)
|
|
if (parsed > data_len)
|
|
if (parsed > data_len)
|
|
break;
|
|
break;
|
|
|
|
|
|
- if (data[1] == EIR_NAME_COMPLETE)
|
|
|
|
|
|
+ if (data[1] == type)
|
|
return true;
|
|
return true;
|
|
|
|
|
|
data += field_len + 1;
|
|
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;
|
|
data.ssp_mode = 0x01;
|
|
|
|
|
|
if (test_bit(HCI_MGMT, &hdev->dev_flags))
|
|
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
|
|
else
|
|
name_known = true;
|
|
name_known = true;
|
|
|
|
|