diff options
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 17 |
1 files changed, 7 insertions, 10 deletions
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, | |||
| 994 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); | 994 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
| 995 | 995 | ||
| 996 | hci_dev_lock(hdev); | 996 | hci_dev_lock(hdev); |
| 997 | mgmt_read_local_oob_data_complete(hdev, rp->hash, rp->randomizer, | 997 | mgmt_read_local_oob_data_complete(hdev, rp->hash, rp->rand, NULL, NULL, |
| 998 | NULL, NULL, rp->status); | 998 | rp->status); |
| 999 | hci_dev_unlock(hdev); | 999 | hci_dev_unlock(hdev); |
| 1000 | } | 1000 | } |
| 1001 | 1001 | ||
| @@ -1007,8 +1007,8 @@ static void hci_cc_read_local_oob_ext_data(struct hci_dev *hdev, | |||
| 1007 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); | 1007 | BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); |
| 1008 | 1008 | ||
| 1009 | hci_dev_lock(hdev); | 1009 | hci_dev_lock(hdev); |
| 1010 | mgmt_read_local_oob_data_complete(hdev, rp->hash192, rp->randomizer192, | 1010 | mgmt_read_local_oob_data_complete(hdev, rp->hash192, rp->rand192, |
| 1011 | rp->hash256, rp->randomizer256, | 1011 | rp->hash256, rp->rand256, |
| 1012 | rp->status); | 1012 | rp->status); |
| 1013 | hci_dev_unlock(hdev); | 1013 | hci_dev_unlock(hdev); |
| 1014 | } | 1014 | } |
| @@ -3996,11 +3996,9 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev, | |||
| 3996 | 3996 | ||
| 3997 | bacpy(&cp.bdaddr, &ev->bdaddr); | 3997 | bacpy(&cp.bdaddr, &ev->bdaddr); |
| 3998 | memcpy(cp.hash192, data->hash192, sizeof(cp.hash192)); | 3998 | memcpy(cp.hash192, data->hash192, sizeof(cp.hash192)); |
| 3999 | memcpy(cp.randomizer192, data->randomizer192, | 3999 | memcpy(cp.rand192, data->rand192, sizeof(cp.rand192)); |
| 4000 | sizeof(cp.randomizer192)); | ||
| 4001 | memcpy(cp.hash256, data->hash256, sizeof(cp.hash256)); | 4000 | memcpy(cp.hash256, data->hash256, sizeof(cp.hash256)); |
| 4002 | memcpy(cp.randomizer256, data->randomizer256, | 4001 | memcpy(cp.rand256, data->rand256, sizeof(cp.rand256)); |
| 4003 | sizeof(cp.randomizer256)); | ||
| 4004 | 4002 | ||
| 4005 | hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_EXT_DATA_REPLY, | 4003 | hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_EXT_DATA_REPLY, |
| 4006 | sizeof(cp), &cp); | 4004 | sizeof(cp), &cp); |
| @@ -4009,8 +4007,7 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev, | |||
| 4009 | 4007 | ||
| 4010 | bacpy(&cp.bdaddr, &ev->bdaddr); | 4008 | bacpy(&cp.bdaddr, &ev->bdaddr); |
| 4011 | memcpy(cp.hash, data->hash192, sizeof(cp.hash)); | 4009 | memcpy(cp.hash, data->hash192, sizeof(cp.hash)); |
| 4012 | memcpy(cp.randomizer, data->randomizer192, | 4010 | memcpy(cp.rand, data->rand192, sizeof(cp.rand)); |
| 4013 | sizeof(cp.randomizer)); | ||
| 4014 | 4011 | ||
| 4015 | hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY, | 4012 | hci_send_cmd(hdev, HCI_OP_REMOTE_OOB_DATA_REPLY, |
| 4016 | sizeof(cp), &cp); | 4013 | sizeof(cp), &cp); |
