mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
Bluetooth: Update Adv monitor count upon removal
This fixes the count of Adv monitor upon monitor removal. The following test was performed. - Start two btmgmt consoles, issue a btmgmt advmon-remove command on one console and observe a MGMT_EV_ADV_MONITOR_REMOVED event on the other. Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Signed-off-by: Howard Chung <howardchung@google.com> Reviewed-by: Alain Michaud <alainm@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
81ebea5352
commit
c88e397968
1 changed files with 2 additions and 0 deletions
|
@ -3061,6 +3061,7 @@ static int free_adv_monitor(int id, void *ptr, void *data)
|
||||||
|
|
||||||
idr_remove(&hdev->adv_monitors_idr, monitor->handle);
|
idr_remove(&hdev->adv_monitors_idr, monitor->handle);
|
||||||
hci_free_adv_monitor(monitor);
|
hci_free_adv_monitor(monitor);
|
||||||
|
hdev->adv_monitors_cnt--;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -3077,6 +3078,7 @@ int hci_remove_adv_monitor(struct hci_dev *hdev, u16 handle)
|
||||||
|
|
||||||
idr_remove(&hdev->adv_monitors_idr, monitor->handle);
|
idr_remove(&hdev->adv_monitors_idr, monitor->handle);
|
||||||
hci_free_adv_monitor(monitor);
|
hci_free_adv_monitor(monitor);
|
||||||
|
hdev->adv_monitors_cnt--;
|
||||||
} else {
|
} else {
|
||||||
/* Remove all monitors if handle is 0. */
|
/* Remove all monitors if handle is 0. */
|
||||||
idr_for_each(&hdev->adv_monitors_idr, &free_adv_monitor, hdev);
|
idr_for_each(&hdev->adv_monitors_idr, &free_adv_monitor, hdev);
|
||||||
|
|
Loading…
Reference in a new issue