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

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

Bluetooth: Store Bluetooth address from controller setup 



During the setup phase of a controller, the Bluetooth address will be
read and to have that original address available for later use, store
it as setup address.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ struct hci_dev { 
	__u8		bus;

	__u8		dev_type;

	bdaddr_t	bdaddr;

	bdaddr_t	setup_addr;

	bdaddr_t	public_addr;

	bdaddr_t	random_addr;

	bdaddr_t	static_addr;

net/bluetooth/hci_event.c

+7 −1
Original line number Diff line number Diff line
@@ -645,8 +645,14 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);



	if (!rp->status)

	if (rp->status)

		return;



	if (test_bit(HCI_INIT, &hdev->flags))

		bacpy(&hdev->bdaddr, &rp->bdaddr);



	if (test_bit(HCI_SETUP, &hdev->dev_flags))

		bacpy(&hdev->setup_addr, &rp->bdaddr);

}



static void hci_cc_read_page_scan_activity(struct hci_dev *hdev,