Bluetooth: Check for force_lesc_support when enabling SMP over BR/EDR

The SMP over BR/EDR support for cross-transport pairing should also be
enabled when the debugfs setting force_lesc_support has been enabled.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a8da7ea9c2c04bfe6b39d3daf6540c94c362ee0f..cc518eb48dc839bd551683d325b4c3489c0000b6 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6967,8 +6967,9 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)
            test_bit(HCI_HS_ENABLED, &hcon->hdev->dev_flags))
                conn->local_fixed_chan |= L2CAP_FC_A2MP;
 
-       if (bredr_sc_enabled(hcon->hdev) &&
-           test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))
+       if (test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags) &&
+           (bredr_sc_enabled(hcon->hdev) ||
+            test_bit(HCI_FORCE_LESC, &hcon->hdev->dbg_flags)))
                conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR;
 
        mutex_init(&conn->ident_lock);