Commit 4518bb0f authored Feb 24, 2014 by Johan Hedberg Committed by Marcel Holtmann Feb 24, 2014

Bluetooth: Fix canceling RPA expiry timer

The RPA expiry timer is only initialized inside mgmt.c when we receive
the first command from user space. This action also involves setting the
HCI_MGMT flag for the first time so that flag acts as a good indicator
of whether the delayed work variable can be touched or not. This patch
fixes hci_dev_do_close to first check the flag.

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

parent c21c0ea0

net/bluetooth/hci_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2257,6 +2257,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
		cancel_delayed_work(&hdev->service_cache);

		cancel_delayed_work_sync(&hdev->le_scan_disable);

		if (test_bit(HCI_MGMT, &hdev->dev_flags))
		cancel_delayed_work_sync(&hdev->rpa_expired);

		hci_dev_lock(hdev);

Admin message