Bluetooth: Fix canceling RPA expiry timer
Subsystems (2)
PATCH 1/1 Bluetooth: Fix canceling RPA expiry timer
From: Johan Hedberg <[email protected]>
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.
--- net/bluetooth/hci_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bluetooth/hci_core.c +3 -1
@@ -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);
Signature · 1 line
1.8.5.3
Marcel Holtmann
maintainerHi Johan,
Quoted 10 lines
The RPA expiry timer is only initialized inside
mgmt.cwhen we receive the first command from user space. This action also involves setting theHCI_MGMTflag 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 fixeshci_dev_do_closeto first check the flag.Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/hci_core.c| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel