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>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6311be775ff291fdda715cc936c11ce2a4859d7d..eec70a4ba36cd4d84a6975bcb25967ad8958f499 100644 (file)
--- 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);