diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-09 08:26:12 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 10:01:36 -0500 |
commit | 272d90df2d4d065e782cafb08358bd8918bf703a (patch) | |
tree | a39907ac765574b8b0bf087a7aa0f37cc580d5a7 /net/bluetooth/smp.c | |
parent | 88c3df13ca06718e5a8f509ae9cbb1228c10d537 (diff) |
Bluetooth: Add address type to user_confirm and user_passkey messages
This patch upadate the user confirm and user passkey mgmt messages to
match the latest API specification by adding an address type parameter
to them.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/smp.c')
-rw-r--r-- | net/bluetooth/smp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 0563f737779a..589766d06f22 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c | |||
@@ -349,9 +349,11 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth, | |||
349 | hci_dev_lock(hcon->hdev); | 349 | hci_dev_lock(hcon->hdev); |
350 | 350 | ||
351 | if (method == REQ_PASSKEY) | 351 | if (method == REQ_PASSKEY) |
352 | ret = mgmt_user_passkey_request(hcon->hdev, conn->dst); | 352 | ret = mgmt_user_passkey_request(hcon->hdev, conn->dst, |
353 | hcon->type, hcon->dst_type); | ||
353 | else | 354 | else |
354 | ret = mgmt_user_confirm_request(hcon->hdev, conn->dst, | 355 | ret = mgmt_user_confirm_request(hcon->hdev, conn->dst, |
356 | hcon->type, hcon->dst_type, | ||
355 | cpu_to_le32(passkey), 0); | 357 | cpu_to_le32(passkey), 0); |
356 | 358 | ||
357 | hci_dev_unlock(hcon->hdev); | 359 | hci_dev_unlock(hcon->hdev); |