From 95664ea35fa36f95d7c13345b2d4ce08e10982e5 Mon Sep 17 00:00:00 2001
From: Brian Gix <bgix@codeaurora.org>
Date: Wed, 21 Dec 2011 16:12:13 -0800
Subject: [PATCH] --- yaml --- r: 279391 b: refs/heads/master c:
 5fe57d9e9edb9182d1fa941b94902444c3174ccd h: refs/heads/master i:   279389:
 f0db339de8d8bb8a3f2a708ff502ec37ee513934   279387:
 ef427e35aa8cd5b08f9886066712fbc79445881a   279383:
 d52c9226b5d2e50205492bfadddaaaf5c29e2421   279375:
 73c233390ad51e18242c190de645c2f496ca3ba7   279359:
 725da82171d0aab67574e40703023bf20f7d6694 v: v3

---
 [refs]                     |  2 +-
 trunk/net/bluetooth/mgmt.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a313102e683..74bdeff7a5a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b64d153a0cc9d2b60e47be013cde8490f16e0a5
+refs/heads/master: 5fe57d9e9edb9182d1fa941b94902444c3174ccd
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index fbcbef6ecceb..2540944d871f 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -30,6 +30,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/mgmt.h>
+#include <net/bluetooth/smp.h>
 
 #define MGMT_VERSION	0
 #define MGMT_REVISION	1
@@ -1642,8 +1643,15 @@ static int user_pairing_resp(struct sock *sk, u16 index, bdaddr_t *bdaddr,
 		}
 
 		/* Continue with pairing via SMP */
+		err = smp_user_confirm_reply(conn, mgmt_op, passkey);
+
+		if (!err)
+			err = cmd_status(sk, index, mgmt_op,
+							MGMT_STATUS_SUCCESS);
+		else
+			err = cmd_status(sk, index, mgmt_op,
+							MGMT_STATUS_FAILED);
 
-		err = cmd_status(sk, index, mgmt_op, MGMT_STATUS_SUCCESS);
 		goto done;
 	}