diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-21 14:52:56 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-21 14:52:56 -0300 |
| commit | 0555891184a5c18df0e2349872e7ecf9701fc5b5 (patch) | |
| tree | 4ce942176ec5605e81ecc3f1ed17930d852a1259 /net/bluetooth/hci_conn.c | |
| parent | e13e21dc5d06bd9ed4a88daf057b8dbe80c220de (diff) | |
| parent | 330605423ca6eafafb8dcc27502bce1c585d1b06 (diff) | |
| download | linux-3.10-0555891184a5c18df0e2349872e7ecf9701fc5b5.tar.gz linux-3.10-0555891184a5c18df0e2349872e7ecf9701fc5b5.tar.bz2 linux-3.10-0555891184a5c18df0e2349872e7ecf9701fc5b5.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
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 2f5ae53057c..fa48c0b3d93 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -670,11 +670,11 @@ 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; - hci_conn_auth(conn, sec_level, auth_type); - return 0; + if (!hci_conn_auth(conn, sec_level, auth_type)) + return 0; encrypt: if (conn->link_mode & HCI_LM_ENCRYPT) |