tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: c8992cffbe741 ("Bluetooth: hci_event: Use of a function table to handle Command Complete")
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

authored by

Wentao Guan and committed by
Luiz Augusto von Dentz e8c00f54 5b86e2a5

+8 -3
+5
include/net/bluetooth/hci.h
··· 879 879 bdaddr_t bdaddr; 880 880 } __packed; 881 881 882 + struct hci_rp_remote_name_req_cancel { 883 + __u8 status; 884 + bdaddr_t bdaddr; 885 + } __packed; 886 + 882 887 #define HCI_OP_READ_REMOTE_FEATURES 0x041b 883 888 struct hci_cp_read_remote_features { 884 889 __le16 handle;
+3 -3
net/bluetooth/hci_event.c
··· 151 151 static u8 hci_cc_remote_name_req_cancel(struct hci_dev *hdev, void *data, 152 152 struct sk_buff *skb) 153 153 { 154 - struct hci_ev_status *rp = data; 154 + struct hci_rp_remote_name_req_cancel *rp = data; 155 155 156 156 bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); 157 157 ··· 4015 4015 HCI_CC_STATUS(HCI_OP_INQUIRY_CANCEL, hci_cc_inquiry_cancel), 4016 4016 HCI_CC_STATUS(HCI_OP_PERIODIC_INQ, hci_cc_periodic_inq), 4017 4017 HCI_CC_STATUS(HCI_OP_EXIT_PERIODIC_INQ, hci_cc_exit_periodic_inq), 4018 - HCI_CC_STATUS(HCI_OP_REMOTE_NAME_REQ_CANCEL, 4019 - hci_cc_remote_name_req_cancel), 4018 + HCI_CC(HCI_OP_REMOTE_NAME_REQ_CANCEL, hci_cc_remote_name_req_cancel, 4019 + sizeof(struct hci_rp_remote_name_req_cancel)), 4020 4020 HCI_CC(HCI_OP_ROLE_DISCOVERY, hci_cc_role_discovery, 4021 4021 sizeof(struct hci_rp_role_discovery)), 4022 4022 HCI_CC(HCI_OP_READ_LINK_POLICY, hci_cc_read_link_policy,