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

Commit 04a6c589 authored by Andre Guedes's avatar Andre Guedes Committed by Marcel Holtmann
Browse files

Bluetooth: Refactor HCI connection code 



hci_connect() is a very simple and useless wrapper of hci_connect_acl
and hci_connect_le functions. Addtionally, all places where hci_connect
is called the link type value is passed explicitly. This way, we can
safely delete hci_connect, declare hci_connect_acl and hci_connect_le
in hci_core.h and call them directly.

No functionality is changed by this patch.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c99ed834

include/net/bluetooth/hci_core.h

+4 −2
Original line number Diff line number Diff line
@@ -641,8 +641,10 @@ void hci_chan_del(struct hci_chan *chan); 
void hci_chan_list_flush(struct hci_conn *conn);

struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle);



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 *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,

				u8 dst_type, u8 sec_level, u8 auth_type);

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

				 u8 sec_level, u8 auth_type);

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

				 __u16 setting);

int hci_conn_check_link_mode(struct hci_conn *conn);

net/bluetooth/hci_conn.c

+4 −20
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static void stop_scan_complete(struct hci_dev *hdev, u8 status) 
	}

}



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

struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,

				u8 dst_type, u8 sec_level, u8 auth_type)

{

	struct hci_conn_params *params;
@@ -729,7 +729,7 @@ static struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	return conn;

}



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

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

				 u8 sec_level, u8 auth_type)

{

	struct hci_conn *acl;
@@ -799,22 +799,6 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, 
	return sco;

}



/* Create SCO, ACL or LE connection. */

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

			     __u8 dst_type, __u8 sec_level, __u8 auth_type)

{

	BT_DBG("%s dst %pMR type 0x%x", hdev->name, dst, type);



	switch (type) {

	case LE_LINK:

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

	case ACL_LINK:

		return hci_connect_acl(hdev, dst, sec_level, auth_type);

	}



	return ERR_PTR(-EINVAL);

}



/* Check link security requirement */

int hci_conn_check_link_mode(struct hci_conn *conn)

{

net/bluetooth/l2cap_core.c

+3 −4
Original line number Diff line number Diff line
@@ -7109,11 +7109,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
	auth_type = l2cap_get_auth_type(chan);



	if (bdaddr_type_is_le(dst_type))

		hcon = hci_connect(hdev, LE_LINK, dst, dst_type,

				   chan->sec_level, auth_type);

		hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level,

				      auth_type);

	else

		hcon = hci_connect(hdev, ACL_LINK, dst, dst_type,

				   chan->sec_level, auth_type);

		hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);



	if (IS_ERR(hcon)) {

		err = PTR_ERR(hcon);

net/bluetooth/mgmt.c

+4 −4
Original line number Diff line number Diff line
@@ -2816,11 +2816,11 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		auth_type = HCI_AT_DEDICATED_BONDING_MITM;



	if (cp->addr.type == BDADDR_BREDR)

		conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr,

				   cp->addr.type, sec_level, auth_type);

		conn = hci_connect_acl(hdev, &cp->addr.bdaddr, sec_level,

				       auth_type);

	else

		conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr,

				   cp->addr.type, sec_level, auth_type);

		conn = hci_connect_le(hdev, &cp->addr.bdaddr, cp->addr.type,

				      sec_level, auth_type);



	if (IS_ERR(conn)) {

		int status;