Bluetooth: Remove no longer needed force_sc_support debugfs option

The force_sc_support debugfs option was introduced to easily work with
pre-production Bluetooth 4.1 silicon. This option is no longer needed
since controllers supporting BR/EDR Secure Connections feature are now
available.

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

1 files changed, 4 insertions, 7 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3d2f7ad1e655..6b3f5537e441 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -570,8 +570,7 @@ static u32 get_supported_settings(struct hci_dev *hdev)
                         settings |= MGMT_SETTING_HS;
                 }
 
-                if (lmp_sc_capable(hdev) ||
-                    test_bit(HCI_FORCE_SC, &hdev->dbg_flags))
+                if (lmp_sc_capable(hdev))
                         settings |= MGMT_SETTING_SECURE_CONN;
         }
 
@@ -4727,8 +4726,8 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
 
         BT_DBG("request for %s", hdev->name);
 
-        if (!test_bit(HCI_LE_ENABLED, &hdev->dev_flags) &&
-            !lmp_sc_capable(hdev) && !test_bit(HCI_FORCE_SC, &hdev->dbg_flags))
+        if (!lmp_sc_capable(hdev) &&
+            !test_bit(HCI_LE_ENABLED, &hdev->dev_flags))
                 return cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,
                                   MGMT_STATUS_NOT_SUPPORTED);
 
@@ -4738,9 +4737,7 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev,
 
         hci_dev_lock(hdev);
 
-        if (!hdev_is_powered(hdev) ||
-            (!lmp_sc_capable(hdev) &&
-             !test_bit(HCI_FORCE_SC, &hdev->dbg_flags)) ||
+        if (!hdev_is_powered(hdev) || !lmp_sc_capable(hdev) ||
             !test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {
                 bool changed;