Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[uclinux-h8/linux.git] / net / bluetooth / l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a2b6dfa..d04dc00 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6966,8 +6966,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);