---

yaml --- r: 279391 b: refs/heads/master c: 5fe57d9 h: refs/heads/master i: 279389: f0db339 279387: ef427e3 279383: d52c922 279375: 73c2333 279359: 725da82 v: v3
git-mirror · Dec 22, 2011 · 95664ea · 95664ea
1 parent b24fbb0
commit 95664ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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;
 	}