diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-19 14:12:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-19 14:12:11 -0500 |
| commit | 9763152c94ff7207b3532b4105272a0a6030cd61 (patch) | |
| tree | ca5b917143a04cbb5fcd494c2459b0b7e405c64e /net/bluetooth/hci_conn.c | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
| parent | d7660918fce210f421cc58c060ca3de71e4ffd37 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
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 e0af7237cd9..c1c597e3e19 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)) |