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

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

Bluetooth: Use address type info from user-space 



In order to establish a LE connection we need the address type
information. User-space already pass this information to kernel
through struct sockaddr_l2.

This patch adds the dst_type parameter to l2cap_chan_connect so we
are able to pass the address type info from user-space down to
hci_conn layer.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b12f62cf

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ struct l2cap_chan *l2cap_chan_create(void); 
void l2cap_chan_close(struct l2cap_chan *chan, int reason);

void l2cap_chan_destroy(struct l2cap_chan *chan);

int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,

								bdaddr_t *dst);

		       bdaddr_t *dst, u8 dst_type);

int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,

								u32 priority);

void l2cap_chan_busy(struct l2cap_chan *chan, int busy);

net/bluetooth/l2cap_core.c

+6 −5
Original line number Diff line number Diff line
@@ -1394,7 +1394,8 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, 
	return c1;

}



int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst)

int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,

		       bdaddr_t *dst, u8 dst_type)

{

	struct sock *sk = chan->sk;

	bdaddr_t *src = &bt_sk(sk)->src;
@@ -1404,8 +1405,8 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d 
	__u8 auth_type;

	int err;



	BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),

	       __le16_to_cpu(chan->psm));

	BT_DBG("%s -> %s (type %u) psm 0x%2.2x", batostr(src), batostr(dst),

	       dst_type, __le16_to_cpu(chan->psm));



	hdev = hci_get_route(dst, src);

	if (!hdev)
@@ -1479,10 +1480,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *d 
	auth_type = l2cap_get_auth_type(chan);



	if (chan->dcid == L2CAP_CID_LE_DATA)

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

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

				   chan->sec_level, auth_type);

	else

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

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

				   chan->sec_level, auth_type);



	if (IS_ERR(hcon)) {

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al 
		return -EINVAL;



	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),

				&la.l2_bdaddr);

				 &la.l2_bdaddr, la.l2_bdaddr_type);

	if (err)

		return err;