diff options
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 14 |
1 files changed, 7 insertions, 7 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) | |||
| 3469 | } | 3469 | } |
| 3470 | 3470 | ||
| 3471 | int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, | 3471 | int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 3472 | u8 *hash, u8 *randomizer) | 3472 | u8 *hash, u8 *rand) |
| 3473 | { | 3473 | { |
| 3474 | struct oob_data *data; | 3474 | struct oob_data *data; |
| 3475 | 3475 | ||
| @@ -3484,10 +3484,10 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
| 3484 | } | 3484 | } |
| 3485 | 3485 | ||
| 3486 | memcpy(data->hash192, hash, sizeof(data->hash192)); | 3486 | memcpy(data->hash192, hash, sizeof(data->hash192)); |
| 3487 | memcpy(data->randomizer192, randomizer, sizeof(data->randomizer192)); | 3487 | memcpy(data->rand192, rand, sizeof(data->rand192)); |
| 3488 | 3488 | ||
| 3489 | memset(data->hash256, 0, sizeof(data->hash256)); | 3489 | memset(data->hash256, 0, sizeof(data->hash256)); |
| 3490 | memset(data->randomizer256, 0, sizeof(data->randomizer256)); | 3490 | memset(data->rand256, 0, sizeof(data->rand256)); |
| 3491 | 3491 | ||
| 3492 | BT_DBG("%s for %pMR", hdev->name, bdaddr); | 3492 | BT_DBG("%s for %pMR", hdev->name, bdaddr); |
| 3493 | 3493 | ||
| @@ -3495,8 +3495,8 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
| 3495 | } | 3495 | } |
| 3496 | 3496 | ||
| 3497 | int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr, | 3497 | int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 3498 | u8 *hash192, u8 *randomizer192, | 3498 | u8 *hash192, u8 *rand192, |
| 3499 | u8 *hash256, u8 *randomizer256) | 3499 | u8 *hash256, u8 *rand256) |
| 3500 | { | 3500 | { |
| 3501 | struct oob_data *data; | 3501 | struct oob_data *data; |
| 3502 | 3502 | ||
| @@ -3511,10 +3511,10 @@ int hci_add_remote_oob_ext_data(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
| 3511 | } | 3511 | } |
| 3512 | 3512 | ||
| 3513 | memcpy(data->hash192, hash192, sizeof(data->hash192)); | 3513 | memcpy(data->hash192, hash192, sizeof(data->hash192)); |
| 3514 | memcpy(data->randomizer192, randomizer192, sizeof(data->randomizer192)); | 3514 | memcpy(data->rand192, rand192, sizeof(data->rand192)); |
| 3515 | 3515 | ||
| 3516 | memcpy(data->hash256, hash256, sizeof(data->hash256)); | 3516 | memcpy(data->hash256, hash256, sizeof(data->hash256)); |
| 3517 | memcpy(data->randomizer256, randomizer256, sizeof(data->randomizer256)); | 3517 | memcpy(data->rand256, rand256, sizeof(data->rand256)); |
| 3518 | 3518 | ||
| 3519 | BT_DBG("%s for %pMR", hdev->name, bdaddr); | 3519 | BT_DBG("%s for %pMR", hdev->name, bdaddr); |
| 3520 | 3520 | ||
