Commit ba7c1b47 authored Mar 16, 2020 by Dmitry Grinberg Committed by Marcel Holtmann Mar 18, 2020

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>

parent 905d7b13

net/bluetooth/hci_request.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -2727,23 +2727,6 @@ static int active_scan(struct hci_request *req, unsigned long opt)

		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
		* running. Thus, we should temporarily stop it in order to set the
		* discovery scanning parameters.

Admin message