Bluetooth: Fix l2cap conn failures for ssp devices
authorPeter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Tue, 9 Aug 2011 20:26:55 +0000 (16:26 -0400)
committerJaikumar Ganesh <jaikumarg@android.com>
Mon, 29 Aug 2011 22:24:13 +0000 (15:24 -0700)
commit5e4fcd2c556e25e1b6787dcd0c97b06e29e42292
tree9c4a242420f7729abea46f8757c0b3fb0cac5bd5
parent9b076887d4fd85a5bb90a017571cccb95f467bec
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