summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorPaulo Sérgio <paulo.sergio@openbossa.org>2012-10-25 16:55:51 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-11-09 16:45:37 +0100
commit896ea28ea824d49671fc7e9315d9c5be491a644f (patch)
tree008868caacda045b56622f02acf0349b841d8be6 /net/bluetooth
parent476e44cb19f1fbf2d5883dddcc0ce31b33b45915 (diff)
downloadlinux-3.10-896ea28ea824d49671fc7e9315d9c5be491a644f.tar.gz
linux-3.10-896ea28ea824d49671fc7e9315d9c5be491a644f.tar.bz2
linux-3.10-896ea28ea824d49671fc7e9315d9c5be491a644f.zip
Bluetooth: Fix error status when pairing fails
When pairing fails due to wrong confirm value, the management layer doesn't report a proper error status. It sends MGMT_STATUS_CONNECT_FAILED instead of MGMT_STATUS_AUTH_FAILED. Most of management functions that receive a status as a parameter expects for it to be encoded as a HCI status. But when a SMP pairing fails, the SMP layer sends the SMP reason as the error status to the management layer. This commit maps all SMP reasons to HCI_ERROR_AUTH_FAILURE, which will be converted to MGMT_STATUS_AUTH_FAILED in the management layer. Reported-by: Claudio Takahasi <claudio.takahasi@openbossa.org> Reviewed-by: João Paulo Rechi Vita <jprvita@openbossa.org> Signed-off-by: Paulo Sérgio <paulo.sergio@openbossa.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 2ac8d50861e..a5923378bdf 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -267,7 +267,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags);
mgmt_auth_failed(conn->hcon->hdev, conn->dst, hcon->type,
- hcon->dst_type, reason);
+ hcon->dst_type, HCI_ERROR_AUTH_FAILURE);
cancel_delayed_work_sync(&conn->security_timer);