Hi, On Wed, Feb 01, 2012, Marcel Holtmann wrote: > > 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. > > > > Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> > > --- > > > > v2: Avoids possible race condition between hci_conn_security and > > hci_conn_complete_evt > > v3: Actually compiles :) > > > > net/bluetooth/hci_conn.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx> The patch is now in my bluetooth-next tree after manually fixing conn->pend to conn->flags (otherwise the patch wouldn't apply). Johan -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html