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

Commit db474275 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Gustavo Padovan
Browse files

Bluetooth: Refactor ACL connection into its own function 



The hci_connect() function was starting to get too complicated to be
quickly understood. We can separate the creation of a new ACL
connection into its own function.

Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent d04aef4c

net/bluetooth/hci_conn.c

+22 −10
Original line number Diff line number Diff line
@@ -497,18 +497,10 @@ static struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	return le;

}



/* Create SCO, ACL or LE connection.

 * Device _must_ be locked */

struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,

			     __u8 dst_type, __u8 sec_level, __u8 auth_type)

static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,

						u8 sec_level, u8 auth_type)

{

	struct hci_conn *acl;

	struct hci_conn *sco;



	BT_DBG("%s dst %s", hdev->name, batostr(dst));



	if (type == LE_LINK)

		return hci_connect_le(hdev, dst, dst_type, sec_level, auth_type);



	acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst);

	if (!acl) {
@@ -526,6 +518,26 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, 
		hci_acl_create_connection(acl);

	}



	return acl;

}



/* Create SCO, ACL or LE connection.

 * Device _must_ be locked */

struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,

			     __u8 dst_type, __u8 sec_level, __u8 auth_type)

{

	struct hci_conn *acl;

	struct hci_conn *sco;



	BT_DBG("%s dst %s", hdev->name, batostr(dst));



	if (type == LE_LINK)

		return hci_connect_le(hdev, dst, dst_type, sec_level, auth_type);



	acl = hci_connect_acl(hdev, dst, sec_level, auth_type);

	if (IS_ERR(acl))

		return acl;



	if (type == ACL_LINK)

		return acl;