mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Bluetooth: Do not cancel advertising when starting a scan
BlueZ cancels adv when starting a scan, but does not cancel a scan when starting to adv. Neither is required, so this brings both to a consistent state (of not affecting each other). Some very rare (I've never seen one) BT 4.0 chips will fail to do both at once. Even this is ok since the command that will fail will be the second one, and thus the common sense logic of first-come-first-served is preserved for BLE requests. Signed-off-by: Dmitry Grinberg <dmitrygr@google.com> Signed-off-by: Manish Mandlik <mmandlik@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
905d7b1311
commit
ba7c1b47c1
1 changed files with 0 additions and 17 deletions
|
@ -2727,23 +2727,6 @@ static int active_scan(struct hci_request *req, unsigned long opt)
|
||||||
|
|
||||||
BT_DBG("%s", hdev->name);
|
BT_DBG("%s", hdev->name);
|
||||||
|
|
||||||
if (hci_dev_test_flag(hdev, HCI_LE_ADV)) {
|
|
||||||
hci_dev_lock(hdev);
|
|
||||||
|
|
||||||
/* Don't let discovery abort an outgoing connection attempt
|
|
||||||
* that's using directed advertising.
|
|
||||||
*/
|
|
||||||
if (hci_lookup_le_connect(hdev)) {
|
|
||||||
hci_dev_unlock(hdev);
|
|
||||||
return -EBUSY;
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel_adv_timeout(hdev);
|
|
||||||
hci_dev_unlock(hdev);
|
|
||||||
|
|
||||||
__hci_req_disable_advertising(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If controller is scanning, it means the background scanning is
|
/* If controller is scanning, it means the background scanning is
|
||||||
* running. Thus, we should temporarily stop it in order to set the
|
* running. Thus, we should temporarily stop it in order to set the
|
||||||
* discovery scanning parameters.
|
* discovery scanning parameters.
|
||||||
|
|
Loading…
Reference in a new issue