Commit 70da6243 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan

Bluetooth: Move power on HCI command updates to their own function

These commands will in a subsequent patch be performed in their own
asynchronous request, so it's more readable (not just from a resulting
code perspective but also the way the patches look like) to have them
performed in their own function.
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 5ae327f0
...@@ -3058,17 +3058,8 @@ static int set_bredr_scan(struct hci_dev *hdev) ...@@ -3058,17 +3058,8 @@ static int set_bredr_scan(struct hci_dev *hdev)
return hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); return hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
} }
int mgmt_powered(struct hci_dev *hdev, u8 powered) static int powered_update_hci(struct hci_dev *hdev)
{ {
struct cmd_lookup match = { NULL, hdev };
int err;
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return 0;
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
if (powered) {
u8 link_sec; u8 link_sec;
if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) && if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
...@@ -3089,8 +3080,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) ...@@ -3089,8 +3080,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
*/ */
if (cp.le != lmp_host_le_capable(hdev) || if (cp.le != lmp_host_le_capable(hdev) ||
cp.simul != lmp_host_le_br_capable(hdev)) cp.simul != lmp_host_le_br_capable(hdev))
hci_send_cmd(hdev, hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED,
HCI_OP_WRITE_LE_HOST_SUPPORTED,
sizeof(cp), &cp); sizeof(cp), &cp);
} }
...@@ -3105,6 +3095,22 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) ...@@ -3105,6 +3095,22 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
update_name(hdev, hdev->dev_name); update_name(hdev, hdev->dev_name);
update_eir(hdev); update_eir(hdev);
} }
return 0;
}
int mgmt_powered(struct hci_dev *hdev, u8 powered)
{
struct cmd_lookup match = { NULL, hdev };
int err;
if (!test_bit(HCI_MGMT, &hdev->dev_flags))
return 0;
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
if (powered) {
powered_update_hci(hdev);
} else { } else {
u8 status = MGMT_STATUS_NOT_POWERED; u8 status = MGMT_STATUS_NOT_POWERED;
u8 zero_cod[] = { 0, 0, 0 }; u8 zero_cod[] = { 0, 0, 0 };
......
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