Commit a70f4b5f authored Jul 07, 2014 by Johan Hedberg Committed by Marcel Holtmann Jul 07, 2014

Bluetooth: Don't try background scanning if LE is not enabled



For adapters that do not support LE and ones where LE hasn't been
enabled we shouldn't be trying to initiate background scanning. This
patch adds an extra check to the hci_update_background_scan() to ensure
that we bail out if HCI_LE_ENABLED is not set.

Since we do allow user space to feed the kernel with LE connection
parameters even when LE is not enabled we now need to also call
hci_update_background_scan() as soon as LE gets enabled so that scanning
gets started if necessary.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent cdd6275e

net/bluetooth/hci_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -5403,6 +5403,10 @@ void hci_update_background_scan(struct hci_dev *hdev)
		test_bit(HCI_UNREGISTER, &hdev->dev_flags))
		return;

		/* No point in doing scanning if LE support hasn't been enabled */
		if (!test_bit(HCI_LE_ENABLED, &hdev->dev_flags))
		return;

		/* If discovery is active don't interfere with it */
		if (hdev->discovery.state != DISCOVERY_STOPPED)
		return;

net/bluetooth/mgmt.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2152,6 +2152,8 @@ static void le_enable_complete(struct hci_dev *hdev, u8 status)
		update_scan_rsp_data(&req);
		hci_req_run(&req, NULL);

		hci_update_background_scan(hdev);

		hci_dev_unlock(hdev);
		}
		}