aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-06-21 13:52:56 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-21 13:52:56 -0400
commit0555891184a5c18df0e2349872e7ecf9701fc5b5 (patch)
tree4ce942176ec5605e81ecc3f1ed17930d852a1259 /net/bluetooth/hci_conn.c
parente13e21dc5d06bd9ed4a88daf057b8dbe80c220de (diff)
parent330605423ca6eafafb8dcc27502bce1c585d1b06 (diff)
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 2f5ae53057c7..fa48c0b3d93c 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)
670 goto encrypt; 670 goto encrypt;
671 671
672auth: 672auth:
673 if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend)) 673 if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
674 return 0; 674 return 0;
675 675
676 hci_conn_auth(conn, sec_level, auth_type); 676 if (!hci_conn_auth(conn, sec_level, auth_type))
677 return 0; 677 return 0;
678 678
679encrypt: 679encrypt:
680 if (conn->link_mode & HCI_LM_ENCRYPT) 680 if (conn->link_mode & HCI_LM_ENCRYPT)