aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-06 15:44:23 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-07-06 15:03:15 +0200
commit223683a54bf3f371683c401b9a759c54e1452fa3 (patch)
treee3744bdbab343b4c3ff269d5f46b53c90544e8d4 /net/bluetooth
parentBluetooth: Remove module parameters for ignoring USB devices (diff)
downloadlinux-dev-223683a54bf3f371683c401b9a759c54e1452fa3.tar.xz
linux-dev-223683a54bf3f371683c401b9a759c54e1452fa3.zip
Bluetooth: Fix updating background scan for LE connect complete
When we get an LE connection complete event we should restart background scanning if there are any devices needing it. So far the code was only making the decision based on whether the completed connection had any stored parameters or not. This patch ensures that we trigger background scanning always when necessary. 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/hci_event.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f452e44eff3c..57837cad9919 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4196,12 +4196,11 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
hci_proto_connect_cfm(conn, ev->status);
params = hci_conn_params_lookup(hdev, &conn->dst, conn->dst_type);
- if (params) {
+ if (params)
list_del_init(&params->action);
- hci_update_background_scan(hdev);
- }
unlock:
+ hci_update_background_scan(hdev);
hci_dev_unlock(hdev);
}