From d5499d19ac2b2f2c38efde2e00d41361a0ff8090 Mon Sep 17 00:00:00 2001
From: Ido Yariv <ido@wizery.com>
Date: Mon, 5 Mar 2012 20:07:08 +0200
Subject: [PATCH] --- yaml --- r: 291103 b: refs/heads/master c:
 b3ff53ff006b7906c88adf9d0fccc06a8877fae1 h: refs/heads/master i:   291101:
 5509ed45db5f5fc44f65a01104d3e7333058b073   291099:
 57f4e7ca465cbbfd391d64bc0e47c549e138baf8   291095:
 af4f83aec578018a0ccb4265ef3c3ac2da3e7133   291087:
 2f28307285fd0c4aeed34bc084d69d0713fff3fa   291071:
 3645cf7bfd0a15cabc12e89bc4e298322c925cb4 v: v3

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

diff --git a/[refs] b/[refs]
index efefc33ff860..e8b2d7e6e2de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57d758ae8e8f00e80f233c823aeeef34bd92796
+refs/heads/master: b3ff53ff006b7906c88adf9d0fccc06a8877fae1
diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c
index 8f56282c247d..9883d673873c 100644
--- a/trunk/net/bluetooth/smp.c
+++ b/trunk/net/bluetooth/smp.c
@@ -310,7 +310,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
 			remote_io > SMP_IO_KEYBOARD_DISPLAY)
 		method = JUST_WORKS;
 	else
-		method = gen_method[local_io][remote_io];
+		method = gen_method[remote_io][local_io];
 
 	/* If not bonding, don't ask user to confirm a Zero TK */
 	if (!(auth & SMP_AUTH_BONDING) && method == JUST_CFM)