aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci.h1
-rw-r--r--include/net/bluetooth/hci_core.h3
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 */
173enum { 173enum {
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 ----- */