summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-06-06 18:54:15 +0800
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-06-08 01:50:15 -0300
commit476585ecf08067ac4e81d1a4cb19e2caf2093471 (patch)
treec018ab3d6ee2f2a480783c4cb404e50cf200bcf5 /net/bluetooth
parentddcd0f41471a1e0394c8840a119ec3986a78462c (diff)
downloadblackbird-op-linux-476585ecf08067ac4e81d1a4cb19e2caf2093471.tar.gz
blackbird-op-linux-476585ecf08067ac4e81d1a4cb19e2caf2093471.zip
Bluetooth: Fix SMP pairing method selection
The tk_request function takes the local IO capability as the second last parameter and the remote IO capability as the last parameter. They were previously swapped: when we receive a pairing response req->io_capability contains the local one and rsp->io_capability the remote one. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 6fc7c4708f3e..c4ac2849d9c2 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -648,7 +648,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
auth |= (req->auth_req | rsp->auth_req) & SMP_AUTH_MITM;
- ret = tk_request(conn, 0, auth, rsp->io_capability, req->io_capability);
+ ret = tk_request(conn, 0, auth, req->io_capability, rsp->io_capability);
if (ret)
return SMP_UNSPECIFIED;
OpenPOWER on IntegriCloud