]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Bluetooth: Fix l2cap conn failures for ssp devices
authorPeter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Tue, 9 Aug 2011 20:26:55 +0000 (16:26 -0400)
committerColin Cross <ccross@android.com>
Tue, 14 Feb 2012 19:26:44 +0000 (11:26 -0800)
commit88cb72e1243df38ea2b84f81fa70b398e6234953
treec1e81e9cfd1d4af16d04f609146015af7b0bf3b5
parentaec7cfff78584386acff3f02c9c2011b3f558352
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