diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2015-10-21 18:03:10 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2015-10-21 18:58:23 +0200 |
| commit | 17bc08f0d1b17d6d5e4967c1b430af627c5f2041 (patch) | |
| tree | 5c5fb50ea65d5eef6a542bde47848fe3659a1a55 /net/bluetooth/hci_conn.c | |
| parent | Bluetooth: Remove redundant (and possibly wrong) flag clearing (diff) | |
| download | linux-dev-17bc08f0d1b17d6d5e4967c1b430af627c5f2041.tar.xz linux-dev-17bc08f0d1b17d6d5e4967c1b430af627c5f2041.zip | |
Bluetooth: Remove unnecessary hci_explicit_connect_lookup function
There's only one user of this helper which can be replaces with a call
to hci_pend_le_action_lookup() and a check for params->explicit_connect.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 6ef1b4cc71a6..11316159a5a7 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -83,8 +83,9 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn) bdaddr_type = irk->addr_type; } - params = hci_explicit_connect_lookup(hdev, bdaddr, bdaddr_type); - if (!params) + params = hci_pend_le_action_lookup(&hdev->pend_le_conns, bdaddr, + bdaddr_type); + if (!params || !params->explicit_connect) return; /* The connection attempt was doing scan for new RPA, and is |