Hi Wentao,
On Mon, Mar 17, 2025 at 11:53 AM Wentao Guan <guanwentao@xxxxxxxxxxxxx> wrote:
>
> 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"
Please add the Fixes tag pointing to the patch which introduced the
hci_rp_remote_name_req_cancel.
> Signed-off-by: Wentao Guan <guanwentao@xxxxxxxxxxxxx>
> ---
> include/net/bluetooth/hci.h | 5 +++++
> net/bluetooth/hci_event.c | 4 ++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 0d51970d809f..b9a95c2735e0 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -855,6 +855,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;
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index 2cc7a9306350..a7b0e36609d9 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -4005,8 +4005,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,
> --
> 2.20.1
>
>
--
Luiz Augusto von Dentz
