From: Max Chou <[email protected]>
The original code did not determine the length value of the HCI command
for drop fw even there's no parameter needed. In this commit, use struct
hci_command_hdr to manage opcode and length. It would be more regular and
more readable.
Suggested-by: Alex Lu <[email protected]>
Signed-off-by: Max Chou <[email protected]>
---
drivers/bluetooth/btrtl.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 9a6ae8a2adfc..04399b3c39a0 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -1044,12 +1044,11 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
struct btrtl_device_info *btrtl_dev;
struct sk_buff *skb;
struct hci_rp_read_local_version *resp;
+ struct hci_command_hdr *cmd;
char cfg_name[40];
u16 hci_rev, lmp_subver;
u8 hci_ver, lmp_ver, chip_type = 0;
int ret;
- u16 opcode;
- u8 cmd[2];
u8 reg_val[2];
btrtl_dev = kzalloc(sizeof(*btrtl_dev), GFP_KERNEL);
@@ -1118,15 +1117,14 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
btrtl_dev->drop_fw = false;
if (btrtl_dev->drop_fw) {
- opcode = hci_opcode_pack(0x3f, 0x66);
- cmd[0] = opcode & 0xff;
- cmd[1] = opcode >> 8;
-
- skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
+ skb = bt_skb_alloc(sizeof(*cmd), GFP_KERNEL);
if (!skb)
goto err_free;
- skb_put_data(skb, cmd, sizeof(cmd));
+ cmd = skb_put(skb, HCI_COMMAND_HDR_SIZE);
+ cmd->opcode = cpu_to_le16(0xfc66);
+ cmd->plen = 0;
+
hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
ret = hdev->send(hdev, skb);
--
2.34.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=752085
---Test result---
Test Summary:
CheckPatch PASS 0.71 seconds
GitLint PASS 0.31 seconds
SubjectPrefix PASS 0.10 seconds
BuildKernel PASS 39.19 seconds
CheckAllWarning PASS 41.75 seconds
CheckSparse PASS 47.01 seconds
CheckSmatch PASS 128.01 seconds
BuildKernel32 PASS 37.57 seconds
TestRunnerSetup PASS 528.54 seconds
TestRunner_l2cap-tester PASS 19.53 seconds
TestRunner_iso-tester PASS 25.48 seconds
TestRunner_bnep-tester PASS 6.89 seconds
TestRunner_mgmt-tester PASS 130.99 seconds
TestRunner_rfcomm-tester PASS 10.87 seconds
TestRunner_sco-tester PASS 10.03 seconds
TestRunner_ioctl-tester PASS 11.38 seconds
TestRunner_mesh-tester PASS 8.57 seconds
TestRunner_smp-tester PASS 9.49 seconds
TestRunner_userchan-tester PASS 7.19 seconds
IncrementalBuild PASS 34.76 seconds
---
Regards,
Linux Bluetooth
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Tue, 30 May 2023 16:34:20 +0800 you wrote:
> From: Max Chou <[email protected]>
>
> The original code did not determine the length value of the HCI command
> for drop fw even there's no parameter needed. In this commit, use struct
> hci_command_hdr to manage opcode and length. It would be more regular and
> more readable.
>
> [...]
Here is the summary with links:
- Bluetooth: btrtl: Correct the length of the HCI command for drop fw
https://git.kernel.org/bluetooth/bluetooth-next/c/a332208e733b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html