Bluetooth: Clear HCI_RAW flag when controller becomes configured

When an unconfigured controllers reaches the configured state, it is
important to change the HCI_RAW flag. It indicates to userspace that
the controller is fully operational.

External configuration allows to bring the controller back into an
unconfigured state. In that case make sure HCI_RAW flag is set again.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-07-06 12:11:16 +02:00 committed by Johan Hedberg
parent 9713c17b08
commit 5ea234d3e5
2 changed files with 7 additions and 0 deletions

View File

@ -2887,6 +2887,12 @@ static void hci_power_on(struct work_struct *work)
*/ */
mgmt_index_added(hdev); mgmt_index_added(hdev);
} else if (test_and_clear_bit(HCI_CONFIG, &hdev->dev_flags)) { } else if (test_and_clear_bit(HCI_CONFIG, &hdev->dev_flags)) {
/* When the controller is now configured, then it
* is important to clear the HCI_RAW flag.
*/
if (!test_bit(HCI_UNCONFIGURED, &hdev->dev_flags))
clear_bit(HCI_RAW, &hdev->flags);
/* Powering on the controller with HCI_CONFIG set only /* Powering on the controller with HCI_CONFIG set only
* happens with the transition from unconfigured to * happens with the transition from unconfigured to
* configured. This will send the Index Added event. * configured. This will send the Index Added event.

View File

@ -5451,6 +5451,7 @@ static int set_external_config(struct sock *sk, struct hci_dev *hdev,
queue_work(hdev->req_workqueue, &hdev->power_on); queue_work(hdev->req_workqueue, &hdev->power_on);
} else { } else {
set_bit(HCI_RAW, &hdev->flags);
mgmt_index_added(hdev); mgmt_index_added(hdev);
} }
} }