commit 62ed9ac5c02f94c8ae007f19248ca9b130eadee4
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 28 10:51:23 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Wed Mar 28 10:51:24 2012 -0700
tree d94fef9d75f066c9144736f497158715a548cb55
parent 833de6e5679c094e96ba8235e555fdea2ffeeac3
parent 9f08bfda36018fe9786896bdda14f416a03aec74

Merge "Bluetooth: Modify security level at remote_features event for BT2.0 devices" into msm-3.0

net/bluetooth/hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1d76674..178bdeb 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1970,6 +1970,9 @@
 		hci_send_cmd(hdev, HCI_OP_READ_REMOTE_EXT_FEATURES,
 							sizeof(cp), &cp);
 		goto unlock;
+	} else  if (!(lmp_ssp_capable(conn)) && conn->auth_initiator &&
+		(conn->pending_sec_level == BT_SECURITY_HIGH)) {
+		conn->pending_sec_level = BT_SECURITY_MEDIUM;
 	}
 
 	if (!ev->status) {