diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2013-01-30 09:50:56 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-03-08 08:38:43 -0500 |
commit | bed71748346ae0807c7f7a2913965508dbd61403 (patch) | |
tree | 2919c16c4f880a6a60d5896e9b7a50026f0b96c2 /net/bluetooth/hci_event.c | |
parent | 7da060c1c01b103d181dba39bce9bd141a945f99 (diff) |
Bluetooth: Rename hci_acl_disconn
As hci_acl_disconn function basically sends the HCI Disconnect Command
and it is used to disconnect ACL, SCO and LE links, renaming it to
hci_disconnect is more suitable.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 477726a63512..5892e54835a1 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -2399,7 +2399,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
2399 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); | 2399 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); |
2400 | 2400 | ||
2401 | if (ev->status && conn->state == BT_CONNECTED) { | 2401 | if (ev->status && conn->state == BT_CONNECTED) { |
2402 | hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE); | 2402 | hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE); |
2403 | hci_conn_put(conn); | 2403 | hci_conn_put(conn); |
2404 | goto unlock; | 2404 | goto unlock; |
2405 | } | 2405 | } |
@@ -3472,7 +3472,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, | |||
3472 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); | 3472 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags); |
3473 | 3473 | ||
3474 | if (ev->status && conn->state == BT_CONNECTED) { | 3474 | if (ev->status && conn->state == BT_CONNECTED) { |
3475 | hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE); | 3475 | hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE); |
3476 | hci_conn_put(conn); | 3476 | hci_conn_put(conn); |
3477 | goto unlock; | 3477 | goto unlock; |
3478 | } | 3478 | } |