提交 9d42820f 编写于 作者: M Marcel Holtmann 提交者: Gustavo Padovan

Bluetooth: Enable Low Energy support by default

The Bluetooth Low Energy support so far was disabled by default via
a module parameter. With this change the module parameter will be removed
and Low Energy is enabled by default.
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NGustavo Padovan <gustavo@padovan.org>
上级 2ee8ce35
...@@ -1438,6 +1438,5 @@ struct hci_inquiry_req { ...@@ -1438,6 +1438,5 @@ struct hci_inquiry_req {
#define IREQ_CACHE_FLUSH 0x0001 #define IREQ_CACHE_FLUSH 0x0001
extern bool enable_hs; extern bool enable_hs;
extern bool enable_le;
#endif /* __HCI_H */ #endif /* __HCI_H */
...@@ -725,7 +725,7 @@ static void hci_set_le_support(struct hci_dev *hdev) ...@@ -725,7 +725,7 @@ static void hci_set_le_support(struct hci_dev *hdev)
memset(&cp, 0, sizeof(cp)); memset(&cp, 0, sizeof(cp));
if (enable_le && test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) { if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
cp.le = 1; cp.le = 1;
cp.simul = !!(hdev->features[6] & LMP_SIMUL_LE_BR); cp.simul = !!(hdev->features[6] & LMP_SIMUL_LE_BR);
} }
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <net/bluetooth/smp.h> #include <net/bluetooth/smp.h>
bool enable_hs; bool enable_hs;
bool enable_le;
#define MGMT_VERSION 1 #define MGMT_VERSION 1
#define MGMT_REVISION 1 #define MGMT_REVISION 1
...@@ -384,10 +383,8 @@ static u32 get_supported_settings(struct hci_dev *hdev) ...@@ -384,10 +383,8 @@ static u32 get_supported_settings(struct hci_dev *hdev)
if (enable_hs) if (enable_hs)
settings |= MGMT_SETTING_HS; settings |= MGMT_SETTING_HS;
if (enable_le) {
if (hdev->features[4] & LMP_LE) if (hdev->features[4] & LMP_LE)
settings |= MGMT_SETTING_LE; settings |= MGMT_SETTING_LE;
}
return settings; return settings;
} }
...@@ -1199,7 +1196,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) ...@@ -1199,7 +1196,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (!enable_le || !(hdev->features[4] & LMP_LE)) { if (!(hdev->features[4] & LMP_LE)) {
err = cmd_status(sk, hdev->id, MGMT_OP_SET_LE, err = cmd_status(sk, hdev->id, MGMT_OP_SET_LE,
MGMT_STATUS_NOT_SUPPORTED); MGMT_STATUS_NOT_SUPPORTED);
goto unlock; goto unlock;
...@@ -3657,6 +3654,3 @@ int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type) ...@@ -3657,6 +3654,3 @@ int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
module_param(enable_hs, bool, 0644); module_param(enable_hs, bool, 0644);
MODULE_PARM_DESC(enable_hs, "Enable High Speed support"); MODULE_PARM_DESC(enable_hs, "Enable High Speed support");
module_param(enable_le, bool, 0644);
MODULE_PARM_DESC(enable_le, "Enable Low Energy support");
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册