summaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-10-16 10:07:51 +0300
committerMarcel Holtmann <marcel@holtmann.org>2015-10-16 10:24:41 +0300
commit49c509220db990ad003060db2267b9bbb597cd94 (patch)
treef771981f049df58235cd958fd99da531a583312c /net/bluetooth/hci_conn.c
parentb958f9a3e87766a88036616389eaaf3ad3bd5fc8 (diff)
downloadlinux-49c509220db990ad003060db2267b9bbb597cd94.tar.xz
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_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 4c240c1cb2cb..d5c06eeab4a3 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1000,8 +1000,8 @@ static int hci_explicit_conn_params_set(struct hci_request *req,
/* If we created new params, or existing params were marked as disabled,
* mark them to be used just once to connect.
*/
- if (params->auto_connect == HCI_AUTO_CONN_DISABLED) {
- params->auto_connect = HCI_AUTO_CONN_EXPLICIT;
+ if (params->auto_connect == HCI_AUTO_CONN_DISABLED ||
+ params->auto_connect == HCI_AUTO_CONN_REPORT) {
list_del_init(&params->action);
list_add(&params->action, &hdev->pend_le_conns);
}