Commit e8c00f54 authored by Wentao Guan's avatar Wentao Guan Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: HCI: Add definition of hci_rp_remote_name_req_cancel 



Return Parameters is not only status, also bdaddr:

BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E
page 1870:
BLUETOOTH CORE SPECIFICATION Version 5.0 | Vol 2, Part E
page 802:

Return parameters:
  Status:
  Size: 1 octet
  BD_ADDR:
  Size: 6 octets

Note that it also fixes the warning:
"Bluetooth: hci0: unexpected cc 0x041a length: 7 > 1"

Fixes: c8992cff ("Bluetooth: hci_event: Use of a function table to handle Command Complete")
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 5b86e2a5

include/net/bluetooth/hci.h

+5 −0
Original line number Diff line number Diff line
@@ -879,6 +879,11 @@ struct hci_cp_remote_name_req_cancel { 
	bdaddr_t bdaddr;

} __packed;



struct hci_rp_remote_name_req_cancel {

	__u8     status;

	bdaddr_t bdaddr;

} __packed;



#define HCI_OP_READ_REMOTE_FEATURES	0x041b

struct hci_cp_read_remote_features {

	__le16   handle;

net/bluetooth/hci_event.c

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static u8 hci_cc_exit_periodic_inq(struct hci_dev *hdev, void *data, 
static u8 hci_cc_remote_name_req_cancel(struct hci_dev *hdev, void *data,

					struct sk_buff *skb)

{

	struct hci_ev_status *rp = data;

	struct hci_rp_remote_name_req_cancel *rp = data;



	bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
@@ -4015,8 +4015,8 @@ static const struct hci_cc { 
	HCI_CC_STATUS(HCI_OP_INQUIRY_CANCEL, hci_cc_inquiry_cancel),

	HCI_CC_STATUS(HCI_OP_PERIODIC_INQ, hci_cc_periodic_inq),

	HCI_CC_STATUS(HCI_OP_EXIT_PERIODIC_INQ, hci_cc_exit_periodic_inq),

	HCI_CC_STATUS(HCI_OP_REMOTE_NAME_REQ_CANCEL,

		      hci_cc_remote_name_req_cancel),

	HCI_CC(HCI_OP_REMOTE_NAME_REQ_CANCEL, hci_cc_remote_name_req_cancel,

	       sizeof(struct hci_rp_remote_name_req_cancel)),

	HCI_CC(HCI_OP_ROLE_DISCOVERY, hci_cc_role_discovery,

	       sizeof(struct hci_rp_role_discovery)),

	HCI_CC(HCI_OP_READ_LINK_POLICY, hci_cc_read_link_policy,