Bluetooth: Simplify the code for re-arming discoverable timeout (36261547) · Commits · 戴 / test

When only the discoverable timeout gets updated, just cancel the current timeout, store the new timeout value. If the new timeout is valid, then arm the discoverable timeout again. Signed-off-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Johan Hedberg <johan.hedberg@intel.com>

net/bluetooth/mgmt.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -1143,15 +1143,13 @@ static int set_discoverable(struct sock sk, struct hci_dev hdev, void *data,
		}

		if (!!cp->val == test_bit(HCI_DISCOVERABLE, &hdev->dev_flags)) {
		if (hdev->discov_timeout > 0) {
		cancel_delayed_work(&hdev->discov_off);
		hdev->discov_timeout = 0;
		}

		if (cp->val && timeout > 0) {
		hdev->discov_timeout = timeout;

		if (cp->val && hdev->discov_timeout > 0) {
		int to = msecs_to_jiffies(hdev->discov_timeout * 1000);
		queue_delayed_work(hdev->workqueue, &hdev->discov_off,
		msecs_to_jiffies(hdev->discov_timeout * 1000));
		to);
		}

		err = send_settings_rsp(sk, MGMT_OP_SET_DISCOVERABLE, hdev);

Admin message