From 4d31c7180c52b0239676bc6f6489ea7fccf31666 Mon Sep 17 00:00:00 2001
From: Peter Hurley <peter@hurleysoftware.com>
Date: Fri, 13 Jan 2012 15:11:30 +0100
Subject: [PATCH] --- yaml --- r: 290910 b: refs/heads/master c:
 b7d05bad1c10a363b6b99f66ac1fa76b6892e618 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7357d9fdfc7f..621e71bfa963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ef866adf9602238c2e83e951a72a1037d4179de
+refs/heads/master: b7d05bad1c10a363b6b99f66ac1fa76b6892e618
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 67c94c4dfc3c..aca71c087a1d 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -630,6 +630,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 
 	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->flags)) {
 		struct hci_cp_auth_requested cp;
+
+		/* encrypt must be pending if auth is also pending */
+		set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
+
 		cp.handle = cpu_to_le16(conn->handle);
 		hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,
 							sizeof(cp), &cp);