Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable



When switching connectable mode off any pending discoverable timeout
must also be disabled to avoid duplicate write_scan_enable commands.

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

parent 5e5282bb

net/bluetooth/mgmt.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -935,9 +935,14 @@ static int set_connectable(struct sock sk, u16 index, void data, u16 len)

		if (cp->val)
		scan = SCAN_PAGE;
		else
		else {
		scan = 0;

		if (test_bit(HCI_ISCAN, &hdev->flags) &&
		hdev->discov_timeout > 0)
		cancel_delayed_work(&hdev->discov_off);
		}

		err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
		if (err < 0)
		mgmt_pending_remove(cmd);