Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b7e796 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 801f13bd

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -1422,5 +1422,6 @@ struct hci_inquiry_req { 
#define IREQ_CACHE_FLUSH 0x0001



extern bool enable_hs;

extern bool enable_le;



#endif /* __HCI_H */

net/bluetooth/hci_core.c

+0 −5
Original line number Diff line number Diff line
@@ -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");

net/bluetooth/hci_event.c

+0 −5
Original line number Diff line number Diff line
@@ -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");

net/bluetooth/mgmt.c

+16 −2
Original line number Diff line number Diff line
@@ -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 (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");