diff options
-rw-r--r-- | net/bluetooth/smp.c | 3 |
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); |