Bluetooth: Fix l2cap conn failures for ssp devices
authorPeter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Tue, 9 Aug 2011 20:26:55 +0000 (16:26 -0400)
committerDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:39:02 +0000 (21:39 -0800)
commit634660c4a24212a1ba9ccff88abf4ff5238603f6
tree01c6907407af1b5256e48fb4ddba4d8d1d32c1d2
parent5dbc25c0f9f3d6c5297c38993b44b7247ba1c539
Bluetooth: Fix l2cap conn failures for ssp devices

Commit 330605423c fixed l2cap conn establishment for non-ssp remote
devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security
is tested (which was always returning failure on any subsequent
security checks).

However, this broke l2cap conn establishment for ssp remote devices
when an ACL link was already established at SDP-level security. This
fix ensures that encryption must be pending whenever authentication
is also pending.

Change-Id: I6876ea5134e90d1f3d0f84e8ed40b92977b3df64
Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
net/bluetooth/hci_conn.c