diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-15 08:21:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-15 08:21:30 +0100 |
| commit | 6a54aebf6978e9f296a4d3da3e40af425163c22e (patch) | |
| tree | 8217c7114db02d8b69c22fc44880749426949bc3 /net/bluetooth/hci_conn.c | |
| parent | 067491b7313c41f49607fce782d29344d1472587 (diff) | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| download | kernel_goldelico_gta04-6a54aebf6978e9f296a4d3da3e40af425163c22e.zip kernel_goldelico_gta04-6a54aebf6978e9f296a4d3da3e40af425163c22e.tar.gz kernel_goldelico_gta04-6a54aebf6978e9f296a4d3da3e40af425163c22e.tar.bz2 | |
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -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 c1c597e..e0af723 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_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) + if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) return 0; if (!hci_conn_auth(conn, sec_level, auth_type)) |