diff options
| author | Johan Hedberg | 2012-02-23 12:30:41 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-23 16:01:49 +0100 |
| commit | 504c8dcd6b0ec3cd36ab221695c5516e88cf3d79 (patch) | |
| tree | fcc0639d4532ffe12898d793f0383e03c5ae5101 /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Set DISCOVERY_STOPPED if controller resets (diff) | |
| download | kernel-qcow2-linux-504c8dcd6b0ec3cd36ab221695c5516e88cf3d79.tar.gz kernel-qcow2-linux-504c8dcd6b0ec3cd36ab221695c5516e88cf3d79.tar.xz kernel-qcow2-linux-504c8dcd6b0ec3cd36ab221695c5516e88cf3d79.zip | |
Bluetooth: mgmt: Fix update_eir/class with HCI_AUTO_OFF flag set
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>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 7fdba8fb9808..4e4889490635 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -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)) @@ -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)) @@ -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); |