From 3a33103d9179f374f8ccf8f8fdafe9cc7a4f1159 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo@padovan.org>
Date: Wed, 16 May 2012 12:17:12 -0300
Subject: [PATCH] --- yaml --- r: 306944 b: refs/heads/master c:
 d839c81372d1f0caee47f87b26a68e91d4ff3847 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0999b0f0c133..cfcdd4dbf152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5daa683f2d3315cd766f550ef7d88bfca1671f4
+refs/heads/master: d839c81372d1f0caee47f87b26a68e91d4ff3847
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 9c60e0d8db5f..4eefb7f65cf6 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -2063,7 +2063,7 @@ static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *
 		clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
 
 		if (ev->status && conn->state == BT_CONNECTED) {
-			hci_acl_disconn(conn, 0x13);
+			hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);
 			hci_conn_put(conn);
 			goto unlock;
 		}