summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/smp.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-09 15:26:12 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 17:01:36 +0200
commit272d90df2d4d065e782cafb08358bd8918bf703a (patch)
treea39907ac765574b8b0bf087a7aa0f37cc580d5a7 /net/bluetooth/smp.c
parent88c3df13ca06718e5a8f509ae9cbb1228c10d537 (diff)
downloadop-kernel-dev-272d90df2d4d065e782cafb08358bd8918bf703a.zip
op-kernel-dev-272d90df2d4d065e782cafb08358bd8918bf703a.tar.gz
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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 0563f73..589766d 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,
hci_dev_lock(hcon->hdev);
if (method == REQ_PASSKEY)
- ret = mgmt_user_passkey_request(hcon->hdev, conn->dst);
+ ret = mgmt_user_passkey_request(hcon->hdev, conn->dst,
+ hcon->type, hcon->dst_type);
else
ret = mgmt_user_confirm_request(hcon->hdev, conn->dst,
+ hcon->type, hcon->dst_type,
cpu_to_le32(passkey), 0);
hci_dev_unlock(hcon->hdev);
OpenPOWER on IntegriCloud