Skip to content

Commit

Permalink
Bluetooth: mgmt: Fix update_eir/class with HCI_AUTO_OFF flag set
Browse files Browse the repository at this point in the history
If we're powered but still have the HCI_AUTO_OFF flag set the
update_eir and update_class functions should not do anything.
Additionally these functions need to be called when the flag is finally
cleared through set_powered or when powering on for real.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg committed Feb 23, 2012
1 parent 69775ff commit 504c8dc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ static int update_eir(struct hci_dev *hdev)
{
struct hci_cp_write_eir cp;

if (!test_bit(HCI_UP, &hdev->flags))
if (!hdev_is_powered(hdev))
return 0;

if (!(hdev->features[6] & LMP_EXT_INQ))
Expand Down Expand Up @@ -573,7 +573,7 @@ static int update_class(struct hci_dev *hdev)

BT_DBG("%s", hdev->name);

if (!test_bit(HCI_UP, &hdev->flags))
if (!hdev_is_powered(hdev))
return 0;

if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
Expand Down Expand Up @@ -3121,6 +3121,9 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)

if (scan)
hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);

update_class(hdev);
update_eir(hdev);
} else {
u8 status = ENETDOWN;
mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);
Expand Down

0 comments on commit 504c8dc

Please sign in to comment.