diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2014-12-31 17:43:18 -0500 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-01-02 16:22:04 -0500 |
| commit | 05b3c3e7905d00a1fe2e9184fdd9b5eac427c736 (patch) | |
| tree | 4251d1ca90974e4bee900fed331ecd23e8285c4c /include/net/bluetooth | |
| parent | 91389af67c3a8d8f9eca5f51deda58fae4d9326e (diff) | |
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>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 884ba004237e..aee16bf5d34f 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -172,7 +172,6 @@ enum { | |||
| 172 | */ | 172 | */ |
| 173 | enum { | 173 | enum { |
| 174 | HCI_DUT_MODE, | 174 | HCI_DUT_MODE, |
| 175 | HCI_FORCE_SC, | ||
| 176 | HCI_FORCE_BREDR_SMP, | 175 | HCI_FORCE_BREDR_SMP, |
| 177 | HCI_FORCE_STATIC_ADDR, | 176 | HCI_FORCE_STATIC_ADDR, |
| 178 | }; | 177 | }; |
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 3e7e5110f298..89f4e3c8a097 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -1017,8 +1017,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); | |||
| 1017 | 1017 | ||
| 1018 | #define hdev_is_powered(hdev) (test_bit(HCI_UP, &hdev->flags) && \ | 1018 | #define hdev_is_powered(hdev) (test_bit(HCI_UP, &hdev->flags) && \ |
| 1019 | !test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) | 1019 | !test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) |
| 1020 | #define bredr_sc_enabled(dev) ((lmp_sc_capable(dev) || \ | 1020 | #define bredr_sc_enabled(dev) (lmp_sc_capable(dev) && \ |
| 1021 | test_bit(HCI_FORCE_SC, &(dev)->dbg_flags)) && \ | ||
| 1022 | test_bit(HCI_SC_ENABLED, &(dev)->dev_flags)) | 1021 | test_bit(HCI_SC_ENABLED, &(dev)->dev_flags)) |
| 1023 | 1022 | ||
| 1024 | /* ----- HCI protocols ----- */ | 1023 | /* ----- HCI protocols ----- */ |
