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

Commit 59e29406 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Rename extfeatures 



This patch renames hdev->extfeatures to hdev->host_features since it
holds the extended features Page 1 (aka host features).

Signed-off-by: default avatarAndre Guedes <aguedespe@gmail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 94f5bfb8

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct hci_dev { 
	__u8		major_class;

	__u8		minor_class;

	__u8		features[8];

	__u8		extfeatures[8];

	__u8		host_features[8];

	__u8		commands[64];

	__u8		ssp_mode;

	__u8		hci_ver;
@@ -676,7 +676,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)



/* ----- Extended LMP capabilities ----- */

#define lmp_host_le_capable(dev)   ((dev)->extfeatures[0] & LMP_HOST_LE)

#define lmp_host_le_capable(dev)   ((dev)->host_features[0] & LMP_HOST_LE)



/* ----- HCI protocols ----- */

static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, 
	if (rp->status)

		return;



	memcpy(hdev->extfeatures, rp->features, 8);

	memcpy(hdev->host_features, rp->features, 8);



	hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status);

}

net/bluetooth/mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static u32 get_current_settings(struct hci_dev *hdev) 
	if (!(hdev->features[4] & LMP_NO_BREDR))

		settings |= MGMT_SETTING_BREDR;



	if (hdev->extfeatures[0] & LMP_HOST_LE)

	if (hdev->host_features[0] & LMP_HOST_LE)

		settings |= MGMT_SETTING_LE;



	if (test_bit(HCI_AUTH, &hdev->flags))