Commit af02dd44 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

Bluetooth: Use req_workqueue for background scanning when powering on

We can easily use the new req_workqueue based background scan update
for the power on case. This also removes the last external user of
__hci_update_background_scan().
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 84235d22
...@@ -7465,9 +7465,8 @@ void mgmt_index_removed(struct hci_dev *hdev) ...@@ -7465,9 +7465,8 @@ void mgmt_index_removed(struct hci_dev *hdev)
} }
/* This function requires the caller holds hdev->lock */ /* This function requires the caller holds hdev->lock */
static void restart_le_actions(struct hci_request *req) static void restart_le_actions(struct hci_dev *hdev)
{ {
struct hci_dev *hdev = req->hdev;
struct hci_conn_params *p; struct hci_conn_params *p;
list_for_each_entry(p, &hdev->le_conn_params, list) { list_for_each_entry(p, &hdev->le_conn_params, list) {
...@@ -7488,8 +7487,6 @@ static void restart_le_actions(struct hci_request *req) ...@@ -7488,8 +7487,6 @@ static void restart_le_actions(struct hci_request *req)
break; break;
} }
} }
__hci_update_background_scan(req);
} }
static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode) static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)
...@@ -7505,6 +7502,9 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode) ...@@ -7505,6 +7502,9 @@ static void powered_complete(struct hci_dev *hdev, u8 status, u16 opcode)
* decide if the public address or static address is used. * decide if the public address or static address is used.
*/ */
smp_register(hdev); smp_register(hdev);
restart_le_actions(hdev);
hci_update_background_scan(hdev);
} }
hci_dev_lock(hdev); hci_dev_lock(hdev);
...@@ -7583,8 +7583,6 @@ static int powered_update_hci(struct hci_dev *hdev) ...@@ -7583,8 +7583,6 @@ static int powered_update_hci(struct hci_dev *hdev)
hdev->cur_adv_instance) hdev->cur_adv_instance)
schedule_adv_instance(&req, hdev->cur_adv_instance, schedule_adv_instance(&req, hdev->cur_adv_instance,
true); true);
restart_le_actions(&req);
} }
link_sec = hci_dev_test_flag(hdev, HCI_LINK_SECURITY); link_sec = hci_dev_test_flag(hdev, HCI_LINK_SECURITY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment