diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-19 23:38:19 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-20 09:05:40 -0700 |
| commit | a81070ba3743400444275cc87f8f91bb5b67dd4b (patch) | |
| tree | 6e65f0b5572dfacf6eeff3e76e9e22d272366776 /net | |
| parent | e8ba3a1f08d9386b6e4abe9b00c21e38029a76a4 (diff) | |
| download | linux-stable-a81070ba3743400444275cc87f8f91bb5b67dd4b.tar.gz linux-stable-a81070ba3743400444275cc87f8f91bb5b67dd4b.tar.bz2 linux-stable-a81070ba3743400444275cc87f8f91bb5b67dd4b.zip | |
Bluetooth: Fix updating settings when there are no HCI commands to send
It is possible that the Set Connectable management command doesn't cause
any HCI commands to send (such as when BR/EDR is disabled). We can't
just send a response to user space in this case but must also update the
necessary device flags and settings. This patch fixes the issue by using
the recently introduced set_connectable_update_settings function.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index b74a157bde09..51d0446bc4ed 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1483,8 +1483,8 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data, if (err < 0) { mgmt_pending_remove(cmd); if (err == -ENODATA) - err = send_settings_rsp(sk, MGMT_OP_SET_CONNECTABLE, - hdev); + err = set_connectable_update_settings(hdev, sk, + cp->val); goto failed; } |