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

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

Bluetooth: Remove redundant IRK lookup in mgmt_device_found() 



Now that we have the process_adv_report() function doing the IRK lookup
and updating the bdaddr we don't need to do this anymore in mgmt.c in
the mgmt_device_found() function.

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

net/bluetooth/mgmt.c

+2 −10
Original line number Diff line number Diff line
@@ -6717,7 +6717,6 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
{

	char buf[512];

	struct mgmt_ev_device_found *ev = (void *) buf;

	struct smp_irk *irk;

	size_t ev_size;



	/* Don't send events for a non-kernel initiated discovery. With
@@ -6739,15 +6738,8 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 


	memset(buf, 0, sizeof(buf));



	irk = hci_get_irk(hdev, bdaddr, addr_type);

	if (irk) {

		bacpy(&ev->addr.bdaddr, &irk->bdaddr);

		ev->addr.type = link_to_bdaddr(link_type, irk->addr_type);

	} else {

	bacpy(&ev->addr.bdaddr, bdaddr);

	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	}



	ev->rssi = rssi;

	ev->flags = cpu_to_le32(flags);