aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 724eea980812..c30c507345f8 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -30,7 +30,7 @@
30#include <net/bluetooth/hci_core.h> 30#include <net/bluetooth/hci_core.h>
31#include <net/bluetooth/a2mp.h> 31#include <net/bluetooth/a2mp.h>
32 32
33static void hci_le_connect(struct hci_conn *conn) 33static void hci_le_create_connection(struct hci_conn *conn)
34{ 34{
35 struct hci_dev *hdev = conn->hdev; 35 struct hci_dev *hdev = conn->hdev;
36 struct hci_cp_le_create_conn cp; 36 struct hci_cp_le_create_conn cp;
@@ -54,12 +54,12 @@ static void hci_le_connect(struct hci_conn *conn)
54 hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp); 54 hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
55} 55}
56 56
57static void hci_le_connect_cancel(struct hci_conn *conn) 57static void hci_le_create_connection_cancel(struct hci_conn *conn)
58{ 58{
59 hci_send_cmd(conn->hdev, HCI_OP_LE_CREATE_CONN_CANCEL, 0, NULL); 59 hci_send_cmd(conn->hdev, HCI_OP_LE_CREATE_CONN_CANCEL, 0, NULL);
60} 60}
61 61
62static void hci_acl_connect(struct hci_conn *conn) 62static void hci_acl_create_connection(struct hci_conn *conn)
63{ 63{
64 struct hci_dev *hdev = conn->hdev; 64 struct hci_dev *hdev = conn->hdev;
65 struct inquiry_entry *ie; 65 struct inquiry_entry *ie;
@@ -103,7 +103,7 @@ static void hci_acl_connect(struct hci_conn *conn)
103 hci_send_cmd(hdev, HCI_OP_CREATE_CONN, sizeof(cp), &cp); 103 hci_send_cmd(hdev, HCI_OP_CREATE_CONN, sizeof(cp), &cp);
104} 104}
105 105
106static void hci_acl_connect_cancel(struct hci_conn *conn) 106static void hci_acl_create_connection_cancel(struct hci_conn *conn)
107{ 107{
108 struct hci_cp_create_conn_cancel cp; 108 struct hci_cp_create_conn_cancel cp;
109 109
@@ -245,9 +245,9 @@ static void hci_conn_timeout(struct work_struct *work)
245 case BT_CONNECT2: 245 case BT_CONNECT2:
246 if (conn->out) { 246 if (conn->out) {
247 if (conn->type == ACL_LINK) 247 if (conn->type == ACL_LINK)
248 hci_acl_connect_cancel(conn); 248 hci_acl_create_connection_cancel(conn);
249 else if (conn->type == LE_LINK) 249 else if (conn->type == LE_LINK)
250 hci_le_connect_cancel(conn); 250 hci_le_create_connection_cancel(conn);
251 } 251 }
252 break; 252 break;
253 case BT_CONFIG: 253 case BT_CONFIG:
@@ -494,7 +494,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
494 return ERR_PTR(-ENOMEM); 494 return ERR_PTR(-ENOMEM);
495 495
496 le->dst_type = bdaddr_to_le(dst_type); 496 le->dst_type = bdaddr_to_le(dst_type);
497 hci_le_connect(le); 497 hci_le_create_connection(le);
498 } 498 }
499 499
500 le->pending_sec_level = sec_level; 500 le->pending_sec_level = sec_level;
@@ -518,7 +518,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
518 acl->sec_level = BT_SECURITY_LOW; 518 acl->sec_level = BT_SECURITY_LOW;
519 acl->pending_sec_level = sec_level; 519 acl->pending_sec_level = sec_level;
520 acl->auth_type = auth_type; 520 acl->auth_type = auth_type;
521 hci_acl_connect(acl); 521 hci_acl_create_connection(acl);
522 } 522 }
523 523
524 if (type == ACL_LINK) 524 if (type == ACL_LINK)
@@ -771,7 +771,7 @@ void hci_conn_check_pending(struct hci_dev *hdev)
771 771
772 conn = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); 772 conn = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);
773 if (conn) 773 if (conn)
774 hci_acl_connect(conn); 774 hci_acl_create_connection(conn);
775 775
776 hci_dev_unlock(hdev); 776 hci_dev_unlock(hdev);
777} 777}