aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-12-05 18:35:45 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2014-12-06 02:51:41 -0500
commitf9be9e8661323fd259a5cc1bec67e3d6bb43ec41 (patch)
treef678961528e1bcdf10d32aee1a1c6786b715cc62
parent5a34bd5f5d8119def4feb1d2b4e3906b71059416 (diff)
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>
-rw-r--r--net/bluetooth/l2cap_core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a8da7ea9c2c0..cc518eb48dc8 100644
--- 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)
6967 test_bit(HCI_HS_ENABLED, &hcon->hdev->dev_flags)) 6967 test_bit(HCI_HS_ENABLED, &hcon->hdev->dev_flags))
6968 conn->local_fixed_chan |= L2CAP_FC_A2MP; 6968 conn->local_fixed_chan |= L2CAP_FC_A2MP;
6969 6969
6970 if (bredr_sc_enabled(hcon->hdev) && 6970 if (test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags) &&
6971 test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags)) 6971 (bredr_sc_enabled(hcon->hdev) ||
6972 test_bit(HCI_FORCE_LESC, &hcon->hdev->dbg_flags)))
6972 conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR; 6973 conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR;
6973 6974
6974 mutex_init(&conn->ident_lock); 6975 mutex_init(&conn->ident_lock);