diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-07 13:24:59 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-07 12:36:39 +0200 |
| commit | ae23ada43d7d644e563a23d4c2cd2aa828be1431 (patch) | |
| tree | c1d981152a491ad211762b41e61196693258c40a | |
| parent | bb3e0a336ae683332c1282d1e84b371b65aba1b4 (diff) | |
| download | linux-ae23ada43d7d644e563a23d4c2cd2aa828be1431.tar.gz linux-ae23ada43d7d644e563a23d4c2cd2aa828be1431.tar.bz2 linux-ae23ada43d7d644e563a23d4c2cd2aa828be1431.zip | |
Bluetooth: Don't let background scanning interfering with discovery
If we have an active discovery going on we shouldn't do any changes to
LE scanning when hci_update_background_scan() is called (a call which
can happen for many different reasons). This patch fixes the issue by
returning from the function if the discovery state is anything else
except DISCOVERY_STOPPED.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 6a0e39f69e03..4f8ba49ac49d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -5403,6 +5403,10 @@ void hci_update_background_scan(struct hci_dev *hdev) test_bit(HCI_UNREGISTER, &hdev->dev_flags)) return; + /* If discovery is active don't interfere with it */ + if (hdev->discovery.state != DISCOVERY_STOPPED) + return; + hci_req_init(&req, hdev); if (list_empty(&hdev->pend_le_conns) && |