diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 22:33:30 -0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 22:33:30 -0200 |
| commit | d7660918fce210f421cc58c060ca3de71e4ffd37 (patch) | |
| tree | ddb4de47fdbc9213cb78cb62354bfb7d6751a659 /net | |
| parent | 79e654787c67f6b05f73366ff8ccac72ba7249e6 (diff) | |
| download | linux-stable-d7660918fce210f421cc58c060ca3de71e4ffd37.tar.gz linux-stable-d7660918fce210f421cc58c060ca3de71e4ffd37.tar.bz2 linux-stable-d7660918fce210f421cc58c060ca3de71e4ffd37.zip | |
Revert "Bluetooth: Revert: Fix L2CAP connection establishment"
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index e0af7237cd92..c1c597e3e198 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -673,7 +673,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) goto encrypt; auth: - if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) + if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) return 0; if (!hci_conn_auth(conn, sec_level, auth_type)) |