diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-02 00:27:02 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-02 13:51:50 +0300 |
| commit | a0cdf960bec0b040307229bc25c40fa33c20dff1 (patch) | |
| tree | 715cbd9cd9e66d9b588d84467c88eadb6024e0e9 /net/bluetooth | |
| parent | 0663ca2a032eea12480a8f86fe08bef9d72f8faf (diff) | |
| download | blackbird-op-linux-a0cdf960bec0b040307229bc25c40fa33c20dff1.tar.gz blackbird-op-linux-a0cdf960bec0b040307229bc25c40fa33c20dff1.zip | |
Bluetooth: Restrict disabling of HS when controller is powered off
Disabling the high speed setting when the controller is powered on has
too many side effects that are not taken care of. And in general it
is not an useful operation anyway. So just make such a command fail
with a rejection error message.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/mgmt.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index dcce0cf1d7cc..4ac31695946b 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1353,10 +1353,17 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) hci_dev_lock(hdev); - if (cp->val) + if (cp->val) { changed = !test_and_set_bit(HCI_HS_ENABLED, &hdev->dev_flags); - else + } else { + if (hdev_is_powered(hdev)) { + err = cmd_status(sk, hdev->id, MGMT_OP_SET_HS, + MGMT_STATUS_REJECTED); + goto unlock; + } + changed = test_and_clear_bit(HCI_HS_ENABLED, &hdev->dev_flags); + } err = send_settings_rsp(sk, MGMT_OP_SET_HS, hdev); if (err < 0) |
