Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bed71748 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

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: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 7da060c1

include/net/bluetooth/hci_core.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -574,7 +574,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev, 
	return NULL;

	return NULL;

}

}





void hci_acl_disconn(struct hci_conn *conn, __u8 reason);

void hci_disconnect(struct hci_conn *conn, __u8 reason);

void hci_setup_sync(struct hci_conn *conn, __u16 handle);

void hci_setup_sync(struct hci_conn *conn, __u16 handle);

void hci_sco_setup(struct hci_conn *conn, __u8 status);

void hci_sco_setup(struct hci_conn *conn, __u8 status);

net/bluetooth/hci_conn.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ static void hci_acl_create_connection_cancel(struct hci_conn *conn) 
	hci_send_cmd(conn->hdev, HCI_OP_CREATE_CONN_CANCEL, sizeof(cp), &cp);

	hci_send_cmd(conn->hdev, HCI_OP_CREATE_CONN_CANCEL, sizeof(cp), &cp);

}

}





void hci_acl_disconn(struct hci_conn *conn, __u8 reason)

void hci_disconnect(struct hci_conn *conn, __u8 reason)

{

{

	struct hci_cp_disconnect cp;

	struct hci_cp_disconnect cp;
@@ -253,7 +253,7 @@ static void hci_conn_disconnect(struct hci_conn *conn) 
		hci_amp_disconn(conn, reason);

		hci_amp_disconn(conn, reason);

		break;

		break;

	default:

	default:

		hci_acl_disconn(conn, reason);

		hci_disconnect(conn, reason);

		break;

		break;

	}

	}

}

}

net/bluetooth/hci_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2398,7 +2398,7 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type) 
		if (c->type == type && c->sent) {

		if (c->type == type && c->sent) {

			BT_ERR("%s killing stalled connection %pMR",

			BT_ERR("%s killing stalled connection %pMR",

			       hdev->name, &c->dst);

			       hdev->name, &c->dst);

			hci_acl_disconn(c, HCI_ERROR_REMOTE_USER_TERM);

			hci_disconnect(c, HCI_ERROR_REMOTE_USER_TERM);

		}

		}

	}

	}

net/bluetooth/hci_event.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2399,7 +2399,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);

		clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);





		if (ev->status && conn->state == BT_CONNECTED) {

		if (ev->status && conn->state == BT_CONNECTED) {

			hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);

			hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);

			hci_conn_put(conn);

			hci_conn_put(conn);

			goto unlock;

			goto unlock;

		}

		}
@@ -3472,7 +3472,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, 
	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);

	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);





	if (ev->status && conn->state == BT_CONNECTED) {

	if (ev->status && conn->state == BT_CONNECTED) {

		hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);

		hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);

		hci_conn_put(conn);

		hci_conn_put(conn);

		goto unlock;

		goto unlock;

	}

	}