diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2015-10-16 10:07:51 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2015-10-16 09:24:41 +0200 |
| commit | 49c509220db990ad003060db2267b9bbb597cd94 (patch) | |
| tree | f771981f049df58235cd958fd99da531a583312c /net/bluetooth/hci_event.c | |
| parent | Bluetooth: Fix reference counting for LE-scan based connections (diff) | |
| download | linux-dev-49c509220db990ad003060db2267b9bbb597cd94.tar.xz linux-dev-49c509220db990ad003060db2267b9bbb597cd94.zip | |
Bluetooth: Fix LE reconnection logic
We can't use hci_explicit_connect_lookup() since that would only cover
explicit connections, leaving normal reconnections completely
untouched. Not using it in turn means leaving out entries in
pend_le_reports.
To fix this and simplify the logic move conn params from the reports
list to the pend_le_conns list for the duration of an explicit
connect. Once the connect is complete move the params back to the
pend_le_reports list. This also means that the explicit connect lookup
function only needs to look into the pend_le_conns list.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 509e41575633..bc31099d3b5b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4653,8 +4653,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev, /* If we're not connectable only connect devices that we have in * our pend_le_conns list. */ - params = hci_explicit_connect_lookup(hdev, addr, addr_type); - + params = hci_pend_le_action_lookup(&hdev->pend_le_conns, addr, + addr_type); if (!params) return NULL; |