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

Commit 9c84d1da authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Move local identity address setting to a central place 



Any time hci_conn_add is used for an LE connection we need to ensure
that the local identity address is correctly described in the src and
src_type variables. This patch moves setting these values directly into
hci_conn_add so that callers don't have to duplicate the effort
themselves.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4408dd15

net/bluetooth/hci_conn.c

+4 −0
Original line number Diff line number Diff line
@@ -401,6 +401,10 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 
	case ACL_LINK:

		conn->pkt_type = hdev->pkt_type & ACL_PTYPE_MASK;

		break;

	case LE_LINK:

		/* conn->src should reflect the local identity address */

		hci_copy_identity_address(hdev, &conn->src, &conn->src_type);

		break;

	case SCO_LINK:

		if (lmp_esco_capable(hdev))

			conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |

net/bluetooth/hci_event.c

+0 −16
Original line number Diff line number Diff line
@@ -3840,17 +3840,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 


		conn->dst_type = ev->bdaddr_type;



		/* The advertising parameters for own address type

		 * define which source address and source address

		 * type this connections has.

		 */

		if (bacmp(&conn->src, BDADDR_ANY)) {

			conn->src_type = ADDR_LE_DEV_PUBLIC;

		} else {

			bacpy(&conn->src, &hdev->static_addr);

			conn->src_type = ADDR_LE_DEV_RANDOM;

		}



		if (ev->role == LE_CONN_ROLE_MASTER) {

			conn->out = true;

			conn->link_mode |= HCI_LM_MASTER;
@@ -3892,11 +3881,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		cancel_delayed_work(&conn->le_conn_timeout);

	}



	/* Ensure that the hci_conn contains the identity address type

	 * regardless of which address the connection was made with.

	 */

	hci_copy_identity_address(hdev, &conn->src, &conn->src_type);



	/* Lookup the identity address from the stored connection

	 * address and address type.

	 *