forked from luck/tmp_suning_uos_patched
Bluetooth: Rename eir_has_complete_name to eir_has_data_type
This allows for other uses such as checking for an embedded class of device value in order to decide whether to append the class or not. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
e319d2e743
commit
4ddb1930f9
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user