diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-21 18:15:49 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-21 19:04:39 +0100 |
| commit | df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba (patch) | |
| tree | 647ba3277d67ee8cd1a739db1f96104aea8311d1 | |
| parent | Bluetooth: mgmt: Allow connectable/discoverable changes in off state (diff) | |
| download | linux-df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba.tar.xz linux-df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba.zip | |
Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable
When switching connectable mode off any pending discoverable timeout
must also be disabled to avoid duplicate write_scan_enable commands.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/mgmt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 6311be775ff2..eec70a4ba36c 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -935,9 +935,14 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len) if (cp->val) scan = SCAN_PAGE; - else + else { scan = 0; + if (test_bit(HCI_ISCAN, &hdev->flags) && + hdev->discov_timeout > 0) + cancel_delayed_work(&hdev->discov_off); + } + err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); if (err < 0) mgmt_pending_remove(cmd); |