diff options
| author | Ilia Kolomisnky <ilia.kolominsky@gmail.com> | 2011-06-14 23:52:26 -0400 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-15 14:03:37 -0400 |
| commit | 330605423ca6eafafb8dcc27502bce1c585d1b06 (patch) | |
| tree | 86f7e31cddff8a1553b95d42998848039af6a379 /net | |
| parent | df3c3931ec58cca3409c71b18ad6da0cd71fe163 (diff) | |
Bluetooth: Fix L2CAP connection establishment
In hci_conn_security ( which is used during L2CAP connection
establishment ) test for HCI_CONN_ENCRYPT_PEND state also
sets this state, which is bogus and leads to connection time-out
on L2CAP sockets in certain situations (especially when
using non-ssp devices )
Signed-off-by: Ilia Kolomisnky <iliak@ti.com>
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 b9aa9862d14b..d3a05b9ade7a 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
| @@ -608,7 +608,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) | |||
| 608 | goto encrypt; | 608 | goto encrypt; |
| 609 | 609 | ||
| 610 | auth: | 610 | auth: |
| 611 | if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) | 611 | if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) |
| 612 | return 0; | 612 | return 0; |
| 613 | 613 | ||
| 614 | if (!hci_conn_auth(conn, sec_level, auth_type)) | 614 | if (!hci_conn_auth(conn, sec_level, auth_type)) |