diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 05:06:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 05:06:42 -0400 |
| commit | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (patch) | |
| tree | dca6322681df2e8f33f65c07defce24db68f645c /net/bluetooth/hci_conn.c | |
| parent | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (diff) | |
| parent | 8f2ffa00fb3c05ec0659cd7b056c4e8e106072f1 (diff) | |
Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 3163330cd4f1..d3a05b9ade7a 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
| @@ -608,11 +608,11 @@ 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 | hci_conn_auth(conn, sec_level, auth_type); | 614 | if (!hci_conn_auth(conn, sec_level, auth_type)) |
| 615 | return 0; | 615 | return 0; |
| 616 | 616 | ||
| 617 | encrypt: | 617 | encrypt: |
| 618 | if (conn->link_mode & HCI_LM_ENCRYPT) | 618 | if (conn->link_mode & HCI_LM_ENCRYPT) |