Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b580614 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix sending write_scan_enable when BR/EDR is disabled 



We should only send the HCI_Write_Scan_Enable command from
mgmt_set_powered_failed() when BR/EDR support is enabled. This is
particularly important when the discoverable setting is also tied to LE.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent eb2a8d20

net/bluetooth/mgmt.c

+5 −2
Original line number Diff line number Diff line
@@ -4337,7 +4337,6 @@ void mgmt_set_powered_failed(struct hci_dev *hdev, int err) 
void mgmt_discoverable_timeout(struct hci_dev *hdev)

{

	struct hci_request req;

	u8 scan = SCAN_PAGE;



	hci_dev_lock(hdev);
@@ -4349,7 +4348,11 @@ void mgmt_discoverable_timeout(struct hci_dev *hdev) 
	clear_bit(HCI_LIMITED_DISCOVERABLE, &hdev->dev_flags);



	hci_req_init(&req, hdev);

	hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, sizeof(scan), &scan);

	if (test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {

		u8 scan = SCAN_PAGE;

		hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE,

			    sizeof(scan), &scan);

	}

	update_class(&req);

	hci_req_run(&req, NULL);