diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2014-02-24 20:35:07 +0200 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-02-24 11:05:26 -0800 |
| commit | 4518bb0fb5eda46a9b118a6fbd9661e62a34a5b6 (patch) | |
| tree | 0056adc1bc2f147c36aee21a098ec2980585e388 /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Enable RPA resolving if mgmt_set_privacy is called (diff) | |
| download | linux-dev-4518bb0fb5eda46a9b118a6fbd9661e62a34a5b6.tar.xz linux-dev-4518bb0fb5eda46a9b118a6fbd9661e62a34a5b6.zip | |
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>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 4bb4f4e7bbbe..669c76ec659a 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2257,7 +2257,9 @@ static int hci_dev_do_close(struct hci_dev *hdev) cancel_delayed_work(&hdev->service_cache); cancel_delayed_work_sync(&hdev->le_scan_disable); - cancel_delayed_work_sync(&hdev->rpa_expired); + + if (test_bit(HCI_MGMT, &hdev->dev_flags)) + cancel_delayed_work_sync(&hdev->rpa_expired); hci_dev_lock(hdev); hci_inquiry_cache_flush(hdev); |