Commit d11ab690 authored by Pauli Virtanen's avatar Pauli Virtanen Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_conn: use HCI dst_type values also for BIS 



For ISO BIS related functions in hci_conn.c, make dst_type values be HCI
address type values, not ISO socket address type values.  This makes it
consistent with CIS functions.

Signed-off-by: default avatarPauli Virtanen <pav@iki.fi>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent a479e713

net/bluetooth/hci_conn.c

+0 −6
Original line number Diff line number Diff line
@@ -2052,12 +2052,6 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type, 
		return -ENOMEM;

	}



	/* Convert from ISO socket address type to HCI address type  */

	if (dst_type == BDADDR_LE_PUBLIC)

		dst_type = ADDR_LE_DEV_PUBLIC;

	else

		dst_type = ADDR_LE_DEV_RANDOM;



	memset(cp, 0, sizeof(*cp));

	cp->sid = sid;

	cp->addr_type = dst_type;

net/bluetooth/iso.c

+4 −2
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ static int iso_connect_bis(struct sock *sk) 
		goto done;

	}



	hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst, iso_pi(sk)->dst_type,

	hcon = hci_connect_bis(hdev, &iso_pi(sk)->dst,

			       le_addr_type(iso_pi(sk)->dst_type),

			       &iso_pi(sk)->qos, iso_pi(sk)->base_len,

			       iso_pi(sk)->base);

	if (IS_ERR(hcon)) {
@@ -875,7 +876,8 @@ static int iso_listen_bis(struct sock *sk) 


	hci_dev_lock(hdev);



	err = hci_pa_create_sync(hdev, &iso_pi(sk)->dst, iso_pi(sk)->dst_type,

	err = hci_pa_create_sync(hdev, &iso_pi(sk)->dst,

				 le_addr_type(iso_pi(sk)->dst_type),

				 iso_pi(sk)->bc_sid);



	hci_dev_unlock(hdev);