Bluetooth: Send device found event on name resolve failure

Introducing NAME_REQUEST_FAILED flag that will be sent together with
device found event on name resolve failure. This will provide the
userspace with an information so it can decide not to resolve the
name for these devices in the future.

Signed-off-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 23a0524061b75aeca34da4e9632358b2579a0957..107b25deae683e8ea4cdaaa3f45c600886c70bac 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -936,10 +936,11 @@ struct mgmt_ev_auth_failed {
        __u8    status;
 } __packed;
 
-#define MGMT_DEV_FOUND_CONFIRM_NAME    0x01
-#define MGMT_DEV_FOUND_LEGACY_PAIRING  0x02
-#define MGMT_DEV_FOUND_NOT_CONNECTABLE 0x04
-#define MGMT_DEV_FOUND_INITIATED_CONN  0x08
+#define MGMT_DEV_FOUND_CONFIRM_NAME            0x01
+#define MGMT_DEV_FOUND_LEGACY_PAIRING          0x02
+#define MGMT_DEV_FOUND_NOT_CONNECTABLE         0x04
+#define MGMT_DEV_FOUND_INITIATED_CONN          0x08
+#define MGMT_DEV_FOUND_NAME_REQUEST_FAILED     0x10
 
 #define MGMT_EV_DEVICE_FOUND           0x0012
 struct mgmt_ev_device_found {

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 394d676c9baa9f09f06aba3bd5bef6e7e259ffcf..324d376f97d4a2765984cb8d84ef4826d9aba397 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2175,13 +2175,10 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,
                return;
 
        list_del(&e->list);
-       if (name) {
-               e->name_state = NAME_KNOWN;
-               mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00,
-                                e->data.rssi, name, name_len);
-       } else {
-               e->name_state = NAME_NOT_KNOWN;
-       }
+
+       e->name_state = name ? NAME_KNOWN : NAME_NOT_KNOWN;
+       mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, e->data.rssi,
+                        name, name_len);
 
        if (hci_resolve_next_name(hdev))
                return;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f8f74d344297e61513c4463508eb9178cec7db4d..bf989ae03f9f2211cfc6517440b79e4cef7ab1f1 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -9615,6 +9615,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
        struct mgmt_ev_device_found *ev;
        char buf[sizeof(*ev) + HCI_MAX_NAME_LENGTH + 2];
        u16 eir_len;
+       u32 flags;
 
        ev = (struct mgmt_ev_device_found *) buf;
 
@@ -9624,10 +9625,17 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
        ev->addr.type = link_to_bdaddr(link_type, addr_type);
        ev->rssi = rssi;
 
-       eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,
-                                 name_len);
+       if (name) {
+               eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,
+                                         name_len);
+               flags = 0;
+       } else {
+               eir_len = 0;
+               flags = MGMT_DEV_FOUND_NAME_REQUEST_FAILED;
+       }
 
        ev->eir_len = cpu_to_le16(eir_len);
+       ev->flags = cpu_to_le32(flags);
 
        mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL);
 }