Bluetooth: mgmt: Fix pairable setting upon initialization

When mgmt is not in use the HCI_PAIRABLE flag will get implicitly set so
that pairing still works with old user space versions. However, as soon
as mgmt comes into play we should clear this flag so that it can be
properly set through the set_pairable command by user space.

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 563190c9f7b0e714a18d11d08e1cd249183bfcf5..0f87030f9c3041766e5ede30c2ae0d9b95ec0285 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -604,9 +604,17 @@ static void service_cache_off(struct work_struct *work)
 
 static void mgmt_init_hdev(struct hci_dev *hdev)
 {
-       if (!test_and_set_bit(HCI_MGMT, &hdev->dev_flags))
+       if (!test_and_set_bit(HCI_MGMT, &hdev->dev_flags)) {
                INIT_DELAYED_WORK(&hdev->service_cache, service_cache_off);
 
+               /* Non-mgmt controlled devices get this bit set
+                * implicitly so that pairing works for them, however
+                * for mgmt we require user-space to explicitly enable
+                * it
+                */
+               clear_bit(HCI_PAIRABLE, &hdev->dev_flags);
+       }
+
        if (!test_and_set_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
                schedule_delayed_work(&hdev->service_cache,
                                msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));