From: Ilia Kolomisnky Date: Wed, 15 Jun 2011 03:52:26 +0000 (+0300) Subject: Bluetooth: Fix L2CAP connection establishment X-Git-Tag: MMI-PSA29.97-13-9~19057^2~14^2~2^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=330605423ca6eafafb8dcc27502bce1c585d1b06;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Gustavo F. Padovan --- 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) 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))