diff options
| author | Johan Hedberg | 2014-07-03 18:33:51 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-07-03 18:45:09 +0200 |
| commit | 738f61859d08771e12b552d043b48c8fc13708d1 (patch) | |
| tree | 3cdd2c69e7274211f846944f972ed999199fcf3e /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Remove unnecessary checks for auto-connected devices (diff) | |
| download | kernel-qcow2-linux-738f61859d08771e12b552d043b48c8fc13708d1.tar.gz kernel-qcow2-linux-738f61859d08771e12b552d043b48c8fc13708d1.tar.xz kernel-qcow2-linux-738f61859d08771e12b552d043b48c8fc13708d1.zip | |
Bluetooth: Add identity address check in param lookup functions
Since we only store entries with identity addresses in the
le_conn_params and pend_le_conns lists we can avoid unnecessary lookups
by checking for an identity address before diving into the lists
themselves.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8882a6cd2876..750f969df8db 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3399,6 +3399,10 @@ struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev, { struct hci_conn_params *params; + /* The conn params list only contains identity addresses */ + if (!hci_is_identity_address(addr, addr_type)) + return NULL; + list_for_each_entry(params, &hdev->le_conn_params, list) { if (bacmp(¶ms->addr, addr) == 0 && params->addr_type == addr_type) { @@ -3432,6 +3436,10 @@ struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev, { struct hci_conn_params *param; + /* The list only contains identity addresses */ + if (!hci_is_identity_address(addr, addr_type)) + return NULL; + list_for_each_entry(param, &hdev->pend_le_conns, pend_le_conn) { if (bacmp(¶m->addr, addr) == 0 && param->addr_type == addr_type) |