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

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

Bluetooth: btqca: Introduce HCI_EV_VENDOR and use it 



Using HCI_VENDOR_PKT for vendor specific events does work since it has
also the value 0xff, but it is actually the packet type indicator
constant and not the event constant. So introduce HCI_EV_VENDOR and
use it.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent ad3e0b2f

drivers/bluetooth/btqca.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) 


	cmd = EDL_PATCH_VER_REQ_CMD;

	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,

				&cmd, HCI_VENDOR_PKT, HCI_INIT_TIMEOUT);

				&cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "Reading QCA version information failed (%d)",
@@ -229,7 +229,7 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
				      cmd);



	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, seg_size + 2, cmd,

				HCI_VENDOR_PKT, HCI_INIT_TIMEOUT);

				HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "QCA Failed to send TLV segment (%d)", err);
@@ -318,7 +318,7 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	cmd[2] = sizeof(bdaddr_t);	/* size */

	memcpy(cmd + 3, bdaddr, sizeof(bdaddr_t));

	skb = __hci_cmd_sync_ev(hdev, EDL_NVM_ACCESS_OPCODE, sizeof(cmd), cmd,

				HCI_VENDOR_PKT, HCI_INIT_TIMEOUT);

				HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "QCA Change address command failed (%d)", err);

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -2176,6 +2176,8 @@ struct hci_evt_le_ext_adv_set_term { 
	__u8	num_evts;

} __packed;



#define HCI_EV_VENDOR			0xff



/* Internal events generated by Bluetooth stack */

#define HCI_EV_STACK_INTERNAL	0xfd

struct hci_ev_stack_internal {