From e695afb66eaf14b33d0d9c6e631df62f21b013d6 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Sun, 18 Dec 2011 22:33:30 -0200 Subject: [PATCH] --- yaml --- r: 276966 b: refs/heads/master c: d7660918fce210f421cc58c060ca3de71e4ffd37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_conn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a227834c02ca..f6ae65e8db49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79e654787c67f6b05f73366ff8ccac72ba7249e6 +refs/heads/master: d7660918fce210f421cc58c060ca3de71e4ffd37 diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c index e0af7237cd92..c1c597e3e198 100644 --- a/trunk/net/bluetooth/hci_conn.c +++ b/trunk/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))