diff options
author | Andre Guedes | 2014-02-27 00:21:50 +0100 |
---|---|---|
committer | Marcel Holtmann | 2014-02-27 04:41:35 +0100 |
commit | c54c3860e3dbaa68128dbb288b2806dd86c230cc (patch) | |
tree | de991b8e59c8aa5463a2793e5d62ac788e753e7f /net/bluetooth/hci_core.c | |
parent | Bluetooth: Connection parameters and auto connection (diff) | |
download | kernel-qcow2-linux-c54c3860e3dbaa68128dbb288b2806dd86c230cc.tar.gz kernel-qcow2-linux-c54c3860e3dbaa68128dbb288b2806dd86c230cc.tar.xz kernel-qcow2-linux-c54c3860e3dbaa68128dbb288b2806dd86c230cc.zip |
Bluetooth: Temporarily stop background scanning on discovery
If the user sends a mgmt start discovery command while the background
scanning is running, we should temporarily stop it. Once the discovery
finishes, we start the background scanning again.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 89ff09249eee..507a137a584b 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1786,6 +1786,8 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) switch (state) { case DISCOVERY_STOPPED: + hci_update_background_scan(hdev); + if (hdev->discovery.state != DISCOVERY_STARTING) mgmt_discovering(hdev, 0); break; |