diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2014-07-07 12:45:54 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-07-07 11:58:38 +0200 |
| commit | 841c564499dca9f4819ae2a5f5beb31694f9634e (patch) | |
| tree | 2ef162580f184df82ddb28f39762566fedbc8a70 /net/bluetooth | |
| parent | Bluetooth: Fix connecting devices during LE device discovery (diff) | |
| download | linux-dev-841c564499dca9f4819ae2a5f5beb31694f9634e.tar.xz linux-dev-841c564499dca9f4819ae2a5f5beb31694f9634e.zip | |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/mgmt.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index be91d55c258b..40244fc0e326 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -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); - } - + bacpy(&ev->addr.bdaddr, bdaddr); + ev->addr.type = link_to_bdaddr(link_type, addr_type); ev->rssi = rssi; ev->flags = cpu_to_le32(flags); |