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

Commit 91c4e9b1 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Add TX power tag to EIR data



The Inquiry Response TX power tag should be added to the Extended
Inquiry Data (EIR) as well.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6935e0f5
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -717,6 +717,10 @@ struct hci_rp_read_local_oob_data {
} __packed;

#define HCI_OP_READ_INQ_RSP_TX_POWER	0x0c58
struct hci_rp_read_inq_rsp_tx_power {
	__u8     status;
	__s8     tx_power;
} __packed;

#define HCI_OP_READ_FLOW_CONTROL_MODE	0x0c66
struct hci_rp_read_flow_control_mode {
+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct hci_dev {
	__u16		lmp_subver;
	__u16		voice_setting;
	__u8		io_capability;
	__s8		inq_tx_power;

	__u16		pkt_type;
	__u16		esco_type;
+6 −3
Original line number Diff line number Diff line
@@ -887,11 +887,14 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
							struct sk_buff *skb)
{
	__u8 status = *((__u8 *) skb->data);
	struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;

	BT_DBG("%s status 0x%x", hdev->name, status);
	BT_DBG("%s status 0x%x", hdev->name, rp->status);

	if (!rp->status)
		hdev->inq_tx_power = rp->tx_power;

	hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, status);
	hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, rp->status);
}

static void hci_cc_set_event_flt(struct hci_dev *hdev, struct sk_buff *skb)
+9 −0
Original line number Diff line number Diff line
@@ -479,6 +479,15 @@ static void create_eir(struct hci_dev *hdev, u8 *data)
		ptr += (name_len + 2);
	}

	if (hdev->inq_tx_power) {
		ptr[0] = 2;
		ptr[1] = EIR_TX_POWER;
		ptr[2] = (u8) hdev->inq_tx_power;

		eir_len += 3;
		ptr += 3;
	}

	memset(uuid16_list, 0, sizeof(uuid16_list));

	/* Group all UUID16 types */