3 files changed, 23 insertions, 31 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 90ea0b7670d2..bbefb4eea36e 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3469,7 +3469,7 @@ void hci_remote_oob_data_clear(struct hci_dev *hdev)
 }
 
 int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                            u8 *hash, u8 *randomizer)
+                            u8 *hash, u8 *rand)
 {
         struct oob_data *data;
 
@@ -3484,10 +3484,10 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
         }
 
         memcpy(data->hash192, hash, sizeof(data->hash192));
-        memcpy(data->randomizer192, randomizer, sizeof(data->randomizer192));
+        memcpy(data->rand192, rand, sizeof(data->rand192));
 
         memset(data->hash256, 0, sizeof(data->hash256));
-        memset(data->randomizer256, 0, sizeof(data->randomizer256));
+        memset(data->rand256, 0, sizeof(data->rand256));
 
         BT_DBG("%s for %pMR", hdev->name, bdaddr);
 
@@ -3495,8 +3495,8 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
 }
 
 int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                u8 *hash192, u8 *randomizer192,
-                                u8 *hash256, u8 *randomizer256)
+                                u8 *hash192, u8 *rand192,
+                                u8 *hash256, u8 *rand256)
 {
         struct oob_data *data;
 
@@ -3511,10 +3511,10 @@ int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr,
         }
 
         memcpy(data->hash192, hash192, sizeof(data->hash192));
-        memcpy(data->randomizer192, randomizer192, sizeof(data->randomizer192));
+        memcpy(data->rand192, rand192, sizeof(data->rand192));
 
         memcpy(data->hash256, hash256, sizeof(data->hash256));
-        memcpy(data->randomizer256, randomizer256, sizeof(data->randomizer256));
+        memcpy(data->rand256, rand256, sizeof(data->rand256));
 
         BT_DBG("%s for %pMR", hdev->name, bdaddr);
 
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 09d76547d985..844f7d1ff1cd 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -994,8 +994,8 @@ static void hci_cc_read_local_oob_data(struct hci_dev *hdev,
         BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
 
         hci_dev_lock(hdev);
-        mgmt_read_local_oob_data_complete(hdev, rp->hash, rp->randomizer,
-                                          NULL, NULL, rp->status);
+        mgmt_read_local_oob_data_complete(hdev, rp->hash, rp->rand, NULL, NULL,
+                                          rp->status);
         hci_dev_unlock(hdev);
 }
 
@@ -1007,8 +1007,8 @@ static void hci_cc_read_local_oob_ext_data(struct hci_dev *hdev,
         BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
 
         hci_dev_lock(hdev);
-        mgmt_read_local_oob_data_complete(hdev, rp->hash192, rp->randomizer192,
-                                          rp->hash256, rp->randomizer256,
+        mgmt_read_local_oob_data_complete(hdev, rp->hash192, rp->rand192,
+                                          rp->hash256, rp->rand256,
                                           rp->status);
         hci_dev_unlock(hdev);
 }
@@ -3996,11 +3996,9 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
 
                         bacpy(&cp.bdaddr, &ev->bdaddr);
                         memcpy(cp.hash192, data->hash192, sizeof(cp.hash192));
-                        memcpy(cp.randomizer192, data->randomizer192,
-                               sizeof(cp.randomizer192));
+                        memcpy(cp.rand192, data->rand192, sizeof(cp.rand192));
                         memcpy(cp.hash256, data->hash256, sizeof(cp.hash256));
-                        memcpy(cp.randomizer256, data->randomizer256,
-                               sizeof(cp.randomizer256));
+                        memcpy(cp.rand256, data->rand256, sizeof(cp.rand256));
 
                         hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_EXT_DATA_REPLY,
                                      sizeof(cp), &cp);
@@ -4009,8 +4007,7 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
 
                         bacpy(&cp.bdaddr, &ev->bdaddr);
                         memcpy(cp.hash, data->hash192, sizeof(cp.hash));
-                        memcpy(cp.randomizer, data->randomizer192,
-                               sizeof(cp.randomizer));
+                        memcpy(cp.rand, data->rand192, sizeof(cp.rand));
 
                         hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY,
                                      sizeof(cp), &cp);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 258c9826e78c..cbeef5f62f3b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3598,7 +3598,7 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
                 }
 
                 err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr,
-                                              cp->hash, cp->randomizer);
+                                              cp->hash, cp->rand);
                 if (err < 0)
                         status = MGMT_STATUS_FAILED;
                 else
@@ -3619,10 +3619,8 @@ static int add_remote_oob_data(struct sock *sk, struct hci_dev *hdev,
                 }
 
                 err = hci_add_remote_oob_ext_data(hdev, &cp->addr.bdaddr,
-                                                  cp->hash192,
-                                                  cp->randomizer192,
-                                                  cp->hash256,
-                                                  cp->randomizer256);
+                                                  cp->hash192, cp->rand192,
+                                                  cp->hash256, cp->rand256);
                 if (err < 0)
                         status = MGMT_STATUS_FAILED;
                 else
@@ -6771,8 +6769,8 @@ void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
 }
 
 void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
-                                       u8 *randomizer192, u8 *hash256,
-                                       u8 *randomizer256, u8 status)
+                                       u8 *rand192, u8 *hash256, u8 *rand256,
+                                       u8 status)
 {
         struct pending_cmd *cmd;
 
@@ -6787,16 +6785,14 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
                            mgmt_status(status));
         } else {
                 if (test_bit(HCI_SC_ENABLED, &hdev->dev_flags) &&
-                    hash256 && randomizer256) {
+                    hash256 && rand256) {
                         struct mgmt_rp_read_local_oob_ext_data rp;
 
                         memcpy(rp.hash192, hash192, sizeof(rp.hash192));
-                        memcpy(rp.randomizer192, randomizer192,
-                               sizeof(rp.randomizer192));
+                        memcpy(rp.rand192, rand192, sizeof(rp.rand192));
 
                         memcpy(rp.hash256, hash256, sizeof(rp.hash256));
-                        memcpy(rp.randomizer256, randomizer256,
-                               sizeof(rp.randomizer256));
+                        memcpy(rp.rand256, rand256, sizeof(rp.rand256));
 
                         cmd_complete(cmd->sk, hdev->id,
                                      MGMT_OP_READ_LOCAL_OOB_DATA, 0,
@@ -6805,8 +6801,7 @@ void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,
                         struct mgmt_rp_read_local_oob_data rp;
 
                         memcpy(rp.hash, hash192, sizeof(rp.hash));
-                        memcpy(rp.randomizer, randomizer192,
-                               sizeof(rp.randomizer));
+                        memcpy(rp.rand, rand192, sizeof(rp.rand));
 
                         cmd_complete(cmd->sk, hdev->id,
                                      MGMT_OP_READ_LOCAL_OOB_DATA, 0,