aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-12-07 10:19:12 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2014-12-07 13:03:58 -0500
commit08f63cc5026f20b9124828619c9025738ecb5a5e (patch)
tree6bddd2480515f806c7f8b4fd73f0e09e2e27a3f2 /net/bluetooth
parentf9be9e8661323fd259a5cc1bec67e3d6bb43ec41 (diff)
Bluetooth: Check for force_lesc_support before rejecting SMP over BR/EDR
The SMP over BR/EDR requests for cross-transport pairing should also accepted 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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/smp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 96bf16dcd9e9..3e174f94a46b 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1674,7 +1674,8 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
1674 /* SMP over BR/EDR requires special treatment */ 1674 /* SMP over BR/EDR requires special treatment */
1675 if (conn->hcon->type == ACL_LINK) { 1675 if (conn->hcon->type == ACL_LINK) {
1676 /* We must have a BR/EDR SC link */ 1676 /* We must have a BR/EDR SC link */
1677 if (!test_bit(HCI_CONN_AES_CCM, &conn->hcon->flags)) 1677 if (!test_bit(HCI_CONN_AES_CCM, &conn->hcon->flags) &&
1678 !test_bit(HCI_FORCE_LESC, &hdev->dbg_flags))
1678 return SMP_CROSS_TRANSP_NOT_ALLOWED; 1679 return SMP_CROSS_TRANSP_NOT_ALLOWED;
1679 1680
1680 set_bit(SMP_FLAG_SC, &smp->flags); 1681 set_bit(SMP_FLAG_SC, &smp->flags);