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

Commit e660ed6c authored by Frédéric Dalleau's avatar Frédéric Dalleau Committed by Gustavo Padovan
Browse files

Bluetooth: Use hci_connect_sco directly 



hci_connect is a super function for connecting hci protocols. But the
voice_setting parameter (introduced in subsequent patches) is only
needed by SCO and security requirements are not needed for SCO channels.
Thus, it makes sense to have a separate function for SCO.

Signed-off-by: default avatarFrédéric Dalleau <frederic.dalleau@linux.intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent ffe6b68c

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -584,6 +584,8 @@ 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_sco(struct hci_dev *hdev, int type,

				 bdaddr_t *dst);

int hci_conn_check_link_mode(struct hci_conn *conn);

int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);

int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);

net/bluetooth/hci_conn.c

+2 −6
Original line number Diff line number Diff line
@@ -560,13 +560,12 @@ static struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, 
	return acl;

}



static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type,

				bdaddr_t *dst, u8 sec_level, u8 auth_type)

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

{

	struct hci_conn *acl;

	struct hci_conn *sco;



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

	acl = hci_connect_acl(hdev, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);

	if (IS_ERR(acl))

		return acl;
@@ -612,9 +611,6 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, 
		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);

	case SCO_LINK:

	case ESCO_LINK:

		return hci_connect_sco(hdev, type, dst, sec_level, auth_type);

	}



	return ERR_PTR(-EINVAL);

net/bluetooth/sco.c

+1 −2
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ static int sco_connect(struct sock *sk) 
	else

		type = SCO_LINK;



	hcon = hci_connect(hdev, type, dst, BDADDR_BREDR, BT_SECURITY_LOW,

			   HCI_AT_NO_BONDING);

	hcon = hci_connect_sco(hdev, type, dst);

	if (IS_ERR(hcon)) {

		err = PTR_ERR(hcon);

		goto done;