Bluetooth: Add appearance to Read Ext Controller Info command

If LE is enabled appearance is added to EIR data.

Signed-off-by: Michał Narajowski <michal.narajowski@codecoup.pl>
Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2b6fe10256b90f9a080a8cd55989245c16862bd2..d3837e0633afb1b3a0cd969dc6eae4cf094daa3f 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -878,6 +878,16 @@ static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
        return eir_len;
 }
 
+static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data)
+{
+       eir[eir_len++] = sizeof(type) + sizeof(data);
+       eir[eir_len++] = type;
+       put_unaligned_le16(data, &eir[eir_len]);
+       eir_len += sizeof(data);
+
+       return eir_len;
+}
+
 static u16 append_eir_data_to_buf(struct hci_dev *hdev, u8 *eir)
 {
        u16 eir_len = 0;
@@ -887,6 +897,10 @@ static u16 append_eir_data_to_buf(struct hci_dev *hdev, u8 *eir)
                eir_len = eir_append_data(eir, eir_len, EIR_CLASS_OF_DEV,
                                          hdev->dev_class, 3);
 
+       if (hci_dev_test_flag(hdev, HCI_LE_ENABLED))
+               eir_len = eir_append_le16(eir, eir_len, EIR_APPEARANCE,
+                                         hdev->appearance);
+
        name_len = strlen(hdev->dev_name);
        eir_len = eir_append_data(eir, eir_len, EIR_NAME_COMPLETE,
                                  hdev->dev_name, name_len);