Skip to content

Commit d210ee5

Browse files
committed
Merge tag 'for-net-next-2025-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Luiz Augusto von Dentz says: ==================== bluetooth-next pull request for net-next: core: - MAINTAINERS: add a sub-entry for the Qualcomm bluetooth driver - Avoid a couple dozen -Wflex-array-member-not-at-end warnings - bcsp: receive data only if registered - HCI: Fix using LE/ACL buffers for ISO packets - hci_core: Detect if an ISO link has stalled - ISO: Don't initiate CIS connections if there are no buffers - ISO: Use sk_sndtimeo as conn_timeout drivers: - btusb: Check for unexpected bytes when defragmenting HCI frames - btusb: Add new VID/PID 13d3/3627 for MT7925 - btusb: Add new VID/PID 13d3/3633 for MT7922 - btusb: Add USB ID 2001:332a for D-Link AX9U rev. A1 - btintel: Add support for BlazarIW core - btintel_pcie: Add support for _suspend() / _resume() - btintel_pcie: Define hdev->wakeup() callback - btintel_pcie: Add Bluetooth core/platform as comments - btintel_pcie: Add id of Scorpious, Panther Lake-H484 - btintel_pcie: Refactor Device Coredump * tag 'for-net-next-2025-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (30 commits) Bluetooth: Avoid a couple dozen -Wflex-array-member-not-at-end warnings Bluetooth: hci_sync: Fix using random address for BIG/PA advertisements Bluetooth: ISO: don't leak skb in ISO_CONT RX Bluetooth: ISO: free rx_skb if not consumed Bluetooth: ISO: Fix possible UAF on iso_conn_free Bluetooth: SCO: Fix UAF on sco_conn_free Bluetooth: bcsp: receive data only if registered Bluetooth: btusb: Add new VID/PID 13d3/3633 for MT7922 Bluetooth: btusb: Add new VID/PID 13d3/3627 for MT7925 Bluetooth: remove duplicate h4_recv_buf() in header Bluetooth: btusb: Check for unexpected bytes when defragmenting HCI frames Bluetooth: hci_core: Print information of hcon on hci_low_sent Bluetooth: hci_core: Print number of packets in conn->data_q Bluetooth: Add function and line information to bt_dbg Bluetooth: MGMT: Fix not exposing debug UUID on MGMT_OP_READ_EXP_FEATURES_INFO Bluetooth: hci_core: Detect if an ISO link has stalled Bluetooth: ISO: Use sk_sndtimeo as conn_timeout Bluetooth: HCI: Fix using LE/ACL buffers for ISO packets Bluetooth: ISO: Don't initiate CIS connections if there are no buffers MAINTAINERS: add a sub-entry for the Qualcomm bluetooth driver ... ==================== Link: https://patch.msgid.link/20250927154616.1032839-1-luiz.dentz@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents c39d6d4 + be812ac commit d210ee5

24 files changed

Lines changed: 345 additions & 368 deletions

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20686,6 +20686,13 @@ S: Maintained
2068620686
F: Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml
2068720687
F: drivers/net/wwan/qcom_bam_dmux.c
2068820688

20689+
QUALCOMM BLUETOOTH DRIVER
20690+
L: linux-arm-msm@vger.kernel.org
20691+
S: Maintained
20692+
F: drivers/bluetooth/btqca.[ch]
20693+
F: drivers/bluetooth/btqcomsmd.c
20694+
F: drivers/bluetooth/hci_qca.c
20695+
2068920696
QUALCOMM CAMERA SUBSYSTEM DRIVER
2069020697
M: Robert Foss <rfoss@kernel.org>
2069120698
M: Todor Tomov <todor.too@gmail.com>

drivers/bluetooth/bpa10x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <net/bluetooth/bluetooth.h>
2121
#include <net/bluetooth/hci_core.h>
2222

23-
#include "h4_recv.h"
23+
#include "hci_uart.h"
2424

2525
#define VERSION "0.11"
2626

drivers/bluetooth/btintel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ int btintel_version_info_tlv(struct hci_dev *hdev,
484484
case 0x1d: /* BlazarU (BzrU) */
485485
case 0x1e: /* BlazarI (Bzr) */
486486
case 0x1f: /* Scorpious Peak */
487+
case 0x22: /* BlazarIW (BzrIW) */
487488
break;
488489
default:
489490
bt_dev_err(hdev, "Unsupported Intel hardware variant (0x%x)",
@@ -3253,6 +3254,7 @@ void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant)
32533254
case 0x1d:
32543255
case 0x1e:
32553256
case 0x1f:
3257+
case 0x22:
32563258
hci_set_msft_opcode(hdev, 0xFC1E);
32573259
break;
32583260
default:
@@ -3593,6 +3595,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
35933595
case 0x1d:
35943596
case 0x1e:
35953597
case 0x1f:
3598+
case 0x22:
35963599
/* Display version information of TLV type */
35973600
btintel_version_info_tlv(hdev, &ver_tlv);
35983601

0 commit comments

Comments
 (0)