Bluetooth: Add initial mgmt_confirm_name support

This patch adds initial support for mgmt_confirm_name. It adds the
necessary tracking of the name state by extending the inquiry cache. The
actual name resolving operation (to be done once inquiry is finished) is
not yet part of this patch.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 50 insertions, 1 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 851cb19c55b1..39775119585a 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1967,6 +1967,50 @@ failed:
         return err;
 }
 
+static int confirm_name(struct sock *sk, u16 index, unsigned char *data,
+                                                                u16 len)
+{
+        struct mgmt_cp_confirm_name *cp = (void *) data;
+        struct inquiry_entry *e;
+        struct hci_dev *hdev;
+        int err;
+
+        BT_DBG("hci%u", index);
+
+        if (len != sizeof(*cp))
+                return cmd_status(sk, index, MGMT_OP_CONFIRM_NAME,
+                                MGMT_STATUS_INVALID_PARAMS);
+
+        hdev = hci_dev_get(index);
+        if (!hdev)
+                return cmd_status(sk, index, MGMT_OP_CONFIRM_NAME,
+                                MGMT_STATUS_INVALID_PARAMS);
+
+        hci_dev_lock(hdev);
+
+        e = hci_inquiry_cache_lookup_unknown(hdev, &cp->bdaddr);
+        if (!e) {
+                err = cmd_status (sk, index, MGMT_OP_CONFIRM_NAME,
+                                MGMT_STATUS_INVALID_PARAMS);
+                goto failed;
+        }
+
+        if (cp->name_known) {
+                e->name_state = NAME_KNOWN;
+                list_del(&e->list);
+        } else {
+                e->name_state = NAME_NEEDED;
+                list_move(&e->list, &hdev->inq_cache.resolve);
+        }
+
+        err = 0;
+
+failed:
+        hci_dev_unlock(hdev);
+
+        return err;
+}
+
 static int block_device(struct sock *sk, u16 index, unsigned char *data,
                                                                 u16 len)
 {
@@ -2215,6 +2259,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
         case MGMT_OP_STOP_DISCOVERY:
                 err = stop_discovery(sk, index);
                 break;
+        case MGMT_OP_CONFIRM_NAME:
+                err = confirm_name(sk, index, buf + sizeof(*hdr), len);
+                break;
         case MGMT_OP_BLOCK_DEVICE:
                 err = block_device(sk, index, buf + sizeof(*hdr), len);
                 break;
@@ -2689,7 +2736,8 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
 }
 
 int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                                u8 addr_type, u8 *dev_class, s8 rssi, u8 *eir)
+                                u8 addr_type, u8 *dev_class, s8 rssi,
+                                u8 cfm_name, u8 *eir)
 {
         struct mgmt_ev_device_found ev;
 
@@ -2698,6 +2746,7 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
         bacpy(&ev.addr.bdaddr, bdaddr);
         ev.addr.type = link_to_mgmt(link_type, addr_type);
         ev.rssi = rssi;
+        ev.confirm_name = cfm_name;
 
         if (eir)
                 memcpy(ev.eir, eir, sizeof(ev.eir));