From 39215f6a75763e6c752eb20b411b7836a21a5078 Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Thu, 28 Apr 2011 12:07:58 +0200
Subject: [PATCH] --- yaml --- r: 247253 b: refs/heads/master c:
 58797bf77234154a84827186bda316a1205bde05 h: refs/heads/master i:   247251:
 d6b9a75afb82094d1ecda21434166c4ebcca7e83 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 e9b514165205..e271e89e621f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60b83f571cf17a7a8ca9ddf2090db63e6a594571
+refs/heads/master: 58797bf77234154a84827186bda316a1205bde05
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 40e96cd79e4a..9d50e90993ca 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -2397,7 +2397,7 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn)
 
 	/* If remote requests no-bonding follow that lead */
 	if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01)
-		return 0x00;
+		return conn->remote_auth | (conn->auth_type & 0x01);
 
 	return conn->auth_type;
 }