Bluetooth: Set supported settings based on enabled HS and/or LE

Since neither High Speed (HS) nor Low Energy (LE) are fully implemented
yet, only expose them in supported settings when enabled.

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

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 60a4727be93577a423cf4457310a1d53d7231bd0..ad5e94c757e7e1257e3b60d98e64691727173280 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1422,5 +1422,6 @@ struct hci_inquiry_req {
 #define IREQ_CACHE_FLUSH 0x0001
 
 extern bool enable_hs;
+extern bool enable_le;
 
 #endif /* __HCI_H */

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 87ff7ffdb36731818b3bab088fcffc05171ab62e..cc52e037440e9de5d9c29b43ec2601f0e0e0fff7 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -54,8 +54,6 @@
 
 #define AUTO_OFF_TIMEOUT 2000
 
-bool enable_hs;
-
 static void hci_rx_work(struct work_struct *work);
 static void hci_cmd_work(struct work_struct *work);
 static void hci_tx_work(struct work_struct *work);
@@ -2913,6 +2911,3 @@ int hci_cancel_inquiry(struct hci_dev *hdev)
 
        return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);
 }
-
-module_param(enable_hs, bool, 0644);
-MODULE_PARM_DESC(enable_hs, "Enable High Speed");

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f00faf0ac32fa34c8d2285abc6d8897b2988e717..5d0f92a948c24882137f0d77a3eb92497c5cc3bc 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -44,8 +44,6 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-static bool enable_le;
-
 /* Handle HCI Event packets */
 
 static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
@@ -3545,6 +3543,3 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
        kfree_skb(skb);
        hdev->stat.evt_rx++;
 }
-
-module_param(enable_le, bool, 0644);
-MODULE_PARM_DESC(enable_le, "Enable LE support");

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bc71b45ef4e5fd09d7044a6df892ea7d3d74d27a..f7c2969d8829add59d5e1b4e46b740d5a5e12d8a 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -34,6 +34,9 @@
 #include <net/bluetooth/mgmt.h>
 #include <net/bluetooth/smp.h>
 
+bool enable_hs;
+bool enable_le;
+
 #define MGMT_VERSION   1
 #define MGMT_REVISION  0
 
@@ -374,8 +377,13 @@ static u32 get_supported_settings(struct hci_dev *hdev)
                settings |= MGMT_SETTING_LINK_SECURITY;
        }
 
-       if (hdev->features[4] & LMP_LE)
-               settings |= MGMT_SETTING_LE;
+       if (enable_hs)
+               settings |= MGMT_SETTING_HS;
+
+       if (enable_le) {
+               if (hdev->features[4] & LMP_LE)
+                       settings |= MGMT_SETTING_LE;
+       }
 
        return settings;
 }
@@ -3421,3 +3429,9 @@ int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
        return mgmt_event(MGMT_EV_DEVICE_UNBLOCKED, hdev, &ev, sizeof(ev),
                                                        cmd ? cmd->sk : NULL);
 }
+
+module_param(enable_hs, bool, 0644);
+MODULE_PARM_DESC(enable_hs, "Enable High Speed support");
+
+module_param(enable_le, bool, 0644);
+MODULE_PARM_DESC(enable_le, "Enable Low Energy support");