Bluetooth: hci_sync: Convert MGMT_OP_SET_SECURE_CONN

Synchronous version of MGMT_OP_SET_SECURE_CONN.

Signed-off-by: Brian Gix <brian.gix@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index 156cb5faf64f77652acd69393a3ad418d31cb4fd..4b27a89cc57e5d24da0c95f72f9f3a3f7da30abb 100644 (file)
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -69,6 +69,7 @@ int hci_update_passive_scan_sync(struct hci_dev *hdev);
 int hci_update_passive_scan(struct hci_dev *hdev);
 int hci_read_rssi_sync(struct hci_dev *hdev, __le16 handle);
 int hci_read_tx_power_sync(struct hci_dev *hdev, __le16 handle, u8 type);
+int hci_write_sc_support_sync(struct hci_dev *hdev, u8 val);
 
 int hci_write_fast_connectable_sync(struct hci_dev *hdev, bool enable);
 int hci_update_scan_sync(struct hci_dev *hdev);

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index ad819ff4e30dd5d69b85355ca48a1f1f50171f1b..dc27d665218815479f3ad652852c357588a7918e 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2104,13 +2104,27 @@ int hci_update_passive_scan(struct hci_dev *hdev)
        return hci_cmd_sync_queue(hdev, update_passive_scan_sync, NULL, NULL);
 }
 
-static int hci_write_sc_support_sync(struct hci_dev *hdev, u8 val)
+int hci_write_sc_support_sync(struct hci_dev *hdev, u8 val)
 {
+       int err;
+
        if (!bredr_sc_enabled(hdev) || lmp_host_sc_capable(hdev))
                return 0;
 
-       return __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SC_SUPPORT,
+       err = __hci_cmd_sync_status(hdev, HCI_OP_WRITE_SC_SUPPORT,
                                    sizeof(val), &val, HCI_CMD_TIMEOUT);
+
+       if (!err) {
+               if (val) {
+                       hdev->features[1][0] |= LMP_HOST_SC;
+                       hci_dev_set_flag(hdev, HCI_SC_ENABLED);
+               } else {
+                       hdev->features[1][0] &= ~LMP_HOST_SC;
+                       hci_dev_clear_flag(hdev, HCI_SC_ENABLED);
+               }
+       }
+
+       return err;
 }
 
 static int hci_write_ssp_mode_sync(struct hci_dev *hdev, u8 mode)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index d809ab5e81e307472c61cc59b90c78a9cca2d250..656e34617029b15b2b5ba64b3487637a7492c657 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6094,23 +6094,18 @@ unlock:
        return err;
 }
 
-static void sc_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
+static void set_secure_conn_complete(struct hci_dev *hdev, void *data, int err)
 {
-       struct mgmt_pending_cmd *cmd;
+       struct mgmt_pending_cmd *cmd = data;
        struct mgmt_mode *cp;
 
-       bt_dev_dbg(hdev, "status %u", status);
-
-       hci_dev_lock(hdev);
+       bt_dev_dbg(hdev, "err %d", err);
 
-       cmd = pending_find(MGMT_OP_SET_SECURE_CONN, hdev);
-       if (!cmd)
-               goto unlock;
+       if (err) {
+               u8 mgmt_err = mgmt_status(err);
 
-       if (status) {
-               mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode,
-                               mgmt_status(status));
-               goto remove;
+               mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err);
+               goto done;
        }
 
        cp = cmd->param;
@@ -6130,13 +6125,23 @@ static void sc_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
                break;
        }
 
-       send_settings_rsp(cmd->sk, MGMT_OP_SET_SECURE_CONN, hdev);
+       send_settings_rsp(cmd->sk, cmd->opcode, hdev);
        new_settings(hdev, cmd->sk);
 
-remove:
-       mgmt_pending_remove(cmd);
-unlock:
-       hci_dev_unlock(hdev);
+done:
+       mgmt_pending_free(cmd);
+}
+
+static int set_secure_conn_sync(struct hci_dev *hdev, void *data)
+{
+       struct mgmt_pending_cmd *cmd = data;
+       struct mgmt_mode *cp = cmd->param;
+       u8 val = !!cp->val;
+
+       /* Force write of val */
+       hci_dev_set_flag(hdev, HCI_SC_ENABLED);
+
+       return hci_write_sc_support_sync(hdev, val);
 }
 
 static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
@@ -6144,7 +6149,6 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
 {
        struct mgmt_mode *cp = data;
        struct mgmt_pending_cmd *cmd;
-       struct hci_request req;
        u8 val;
        int err;
 
@@ -6163,7 +6167,7 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
 
        if (cp->val != 0x00 && cp->val != 0x01 && cp->val != 0x02)
                return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,
-                                 MGMT_STATUS_INVALID_PARAMS);
+                                      MGMT_STATUS_INVALID_PARAMS);
 
        hci_dev_lock(hdev);
 
@@ -6194,12 +6198,6 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
                goto failed;
        }
 
-       if (pending_find(MGMT_OP_SET_SECURE_CONN, hdev)) {
-               err = mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,
-                                     MGMT_STATUS_BUSY);
-               goto failed;
-       }
-
        val = !!cp->val;
 
        if (val == hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&
@@ -6208,18 +6206,18 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
                goto failed;
        }
 
-       cmd = mgmt_pending_add(sk, MGMT_OP_SET_SECURE_CONN, hdev, data, len);
-       if (!cmd) {
+       cmd = mgmt_pending_new(sk, MGMT_OP_SET_SECURE_CONN, hdev, data, len);
+       if (!cmd)
                err = -ENOMEM;
-               goto failed;
-       }
+       else
+               err = hci_cmd_sync_queue(hdev, set_secure_conn_sync, cmd,
+                                        set_secure_conn_complete);
 
-       hci_req_init(&req, hdev);
-       hci_req_add(&req, HCI_OP_WRITE_SC_SUPPORT, 1, &val);
-       err = hci_req_run(&req, sc_enable_complete);
        if (err < 0) {
-               mgmt_pending_remove(cmd);
-               goto failed;
+               mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,
+                               MGMT_STATUS_FAILED);
+               if (cmd)
+                       mgmt_pending_free(cmd);
        }
 
 failed: