Bluetooth: Remove codec id field in vendor codec definition
Subsystems (2)
PATCH v3 1/2 Bluetooth: Remove codec id field in vendor codec definition
From: Chethan T N <[email protected]>
As per the specfication vendor codec id is defined. BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2127
---
changes in v3:
Add "Fixes" tag in commit message
changes in v2:
Fix typo in commit message
include/net/bluetooth/hci.h | 1 - 1 file changed, 1 deletion(-)
include/net/bluetooth/hci.h +0 -1
@@ -1455,7 +1455,6 @@ struct hci_std_codecs_v2 { } __packed;struct hci_vnd_codec_v2 { -__u8 id;__le16 cid;__le16 vid;__u8 transport;
Signature · 1 line
2.17.1
PATCH v3 2/2 Bluetooth: Fix support for Read Local Supported Codecs V2
From: Chethan T N <[email protected]>
Handling of Read Local Supported Codecs was broken during the HCI serialization design change patches.
---
changes in v3:
No change
changes in v2:
Fix typo in commit message
net/bluetooth/hci_codec.c | 19 ++++++++++--------- net/bluetooth/hci_sync.c | 10 ++++++---- 2 files changed, 16 insertions(+), 13 deletions(-)
net/bluetooth/hci_codec.c +10 -9
@@ -72,9 +72,8 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport,continue ; } - skb =__hci_cmd_sync (hdev,HCI_OP_READ_LOCAL_CODEC_CAPS , -sizeof (*cmd), cmd, -HCI_CMD_TIMEOUT ); + skb =__hci_cmd_sync_sk (hdev,HCI_OP_READ_LOCAL_CODEC_CAPS , +sizeof (*cmd), cmd,0 ,HCI_CMD_TIMEOUT ,NULL );if (IS_ERR (skb)) {bt_dev_err (hdev,"Failed to read codec capabilities (%ld)" ,PTR_ERR (skb));
@@ -127,8 +126,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev)struct hci_op_read_local_codec_caps caps;__u8 i; - skb =__hci_cmd_sync (hdev,HCI_OP_READ_LOCAL_CODECS ,0 ,NULL , -HCI_CMD_TIMEOUT ); + skb =__hci_cmd_sync_sk (hdev,HCI_OP_READ_LOCAL_CODECS ,0 ,NULL , +0 ,HCI_CMD_TIMEOUT ,NULL );if (IS_ERR (skb)) { bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",
@@ -158,7 +157,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev)for (i =0 ; i < std_codecs->num; i++) { caps.id = std_codecs->codec[i]; caps.direction =0x00 ; -hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); +hci_read_codec_capabilities (hdev, +LOCAL_CODEC_ACL_MASK |LOCAL_CODEC_SCO_MASK , &caps); } skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num)
@@ -178,7 +178,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev) caps.cid = vnd_codecs->codec[i].cid; caps.vid = vnd_codecs->codec[i].vid; caps.direction =0x00 ; -hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); +hci_read_codec_capabilities (hdev, +LOCAL_CODEC_ACL_MASK |LOCAL_CODEC_SCO_MASK , &caps); } error:
@@ -194,8 +195,8 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev)struct hci_op_read_local_codec_caps caps;__u8 i; - skb =__hci_cmd_sync (hdev,HCI_OP_READ_LOCAL_CODECS_V2 ,0 ,NULL , -HCI_CMD_TIMEOUT ); + skb =__hci_cmd_sync_sk (hdev,HCI_OP_READ_LOCAL_CODECS_V2 ,0 ,NULL , +0 ,HCI_CMD_TIMEOUT ,NULL );if (IS_ERR (skb)) { bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",
net/bluetooth/hci_sync.c +6 -4
@@ -12,6 +12,7 @@#include <net/bluetooth/mgmt.h> #include "hci_request.h" +#include "hci_codec.h" #include "hci_debugfs.h" #include "smp.h" #include "eir.h"
@@ -4257,11 +4258,12 @@ static int hci_set_event_mask_page_2_sync(struct hci_dev *hdev)/* Read local codec list if the HCI command is supported */ static int hci_read_local_codecs_sync (struct hci_dev *hdev) { -if (!(hdev->commands[29 ] &0x20 )) -return 0 ; +if (hdev->commands[45 ] &0x04 ) +hci_read_supported_codecs_v2 (hdev); +else if (hdev->commands[29 ] &0x20 ) +hci_read_supported_codecs (hdev); -return __hci_cmd_sync_status (hdev,HCI_OP_READ_LOCAL_CODECS ,0 ,NULL , -HCI_CMD_TIMEOUT ); +return 0 ; }/* Read local pairing options if the HCI command is supported */
Signature · 1 line
2.17.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=697980
---Test result---
Test Summary:
CheckPatch PASS 1.36 seconds GitLint PASS 0.57 seconds SubjectPrefix PASS 0.19 seconds BuildKernel PASS 36.61 seconds BuildKernel32 PASS 32.50 seconds TestRunnerSetup PASS 457.29 seconds TestRunner_l2cap-tester PASS 17.07 seconds TestRunner_iso-tester PASS 16.82 seconds TestRunner_bnep-tester PASS 5.68 seconds TestRunner_mgmt-tester PASS 115.63 seconds TestRunner_rfcomm-tester PASS 10.54 seconds TestRunner_sco-tester PASS 9.60 seconds TestRunner_ioctl-tester PASS 11.14 seconds TestRunner_mesh-tester PASS 7.59 seconds TestRunner_smp-tester PASS 9.83 seconds TestRunner_userchan-tester PASS 6.64 seconds IncrementalBuild PASS 44.26 seconds
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Tue, 22 Nov 2022 14:32:56 +0530 you wrote:
From: Chethan T N <[email protected]>
As per the specfication vendor codec id is defined. BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2127
Fixes 9ae664028a9e ("Bluetooth: Add support for Read Local Supported Codecs V2")Signed-off-by Chethan T N <[email protected]>Signed-off-by Kiran K <[email protected]>[...]
Here is the summary with links:
- [v3,1/2] Bluetooth: Remove codec id field in vendor codec definition
https://git.kernel.org/bluetooth/bluetooth-next/c/f0d0a36e32ab - [v3,2/2] Bluetooth: Fix support for Read Local Supported Codecs V2 https://git.kernel.org/bluetooth/bluetooth-next/c/fb77b0482a8a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html