Revert "Bluetooth: Revert: Fix L2CAP connection establishment"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This reverts commit 4dff523a913197e3314c7b0d08734ab037709093.

It was reported that this patch cause issues when trying to connect to
legacy devices so reverting it.

Reported-by: David Fries <david@fries.net>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Gustavo F. Padovan 14 years ago d7660918 79e65478

+1 -1

1 changed file

expand all

net

bluetooth

hci_conn.c

+1 -1

net/bluetooth/hci_conn.c

··· 673 673 goto encrypt; 674 674 675 675 auth: 676 - if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) 676 + if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) 677 677 return 0; 678 678 679 679 if (!hci_conn_auth(conn, sec_level, auth_type))