Skip to content

Commit 18bc284

Browse files
committed
Merge: Rebase the Bluetooth driver to sync with recent upstream branch v6.15
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7002 # Merge Request Required Information Rebase the Bluetooth driver to sync with recent upstream branch 6.15 ## Summary of Changes JIRA: https://issues.redhat.com/browse/RHEL-93657 Omitted-fix: 6851a0c Bluetooth: hci_dev: replace 'quirks' integer by 'quirk_flags' bitmap ``` Note - The problem it fixes only applies to 32-bit systems, which we don't support, so it can wait for the next rebase. ``` Omitted-fix: 631c868 Bluetooth: L2CAP: Fix not checking l2cap_chan security level ``` Note - This fix was applied through upstream commit: 7af8479 Bluetooth: L2CAP: Fix not checking l2cap_chan security level in this rebase. ``` Omitted-fix: 7af4d7b Bluetooth: hci_devcd_dump: fix out-of-bounds via dev_coredumpv ``` Note - This fix is in the 'net-next' tree, so we'll wait to see if it lands in Linus' tree before pulling it in. ``` Signed-off-by: David Marlin <dmarlin@redhat.com> Approved-by: Bastien Nocera <bnocera@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 2fa662e + 7b2dd80 commit 18bc284

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2764
-1031
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/class/bluetooth/hci<index>/reset
2+
Date: 14-Jan-2025
3+
KernelVersion: 6.13
4+
Contact: linux-bluetooth@vger.kernel.org
5+
Description: This write-only attribute allows users to trigger the vendor reset
6+
method on the Bluetooth device when arbitrary data is written.
7+
The reset may or may not be done through the device transport
8+
(e.g., UART/USB), and can also be done through an out-of-band
9+
approach such as GPIO.

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3464,6 +3464,7 @@ S: Supported
34643464
W: http://www.bluez.org/
34653465
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
34663466
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
3467+
F: Documentation/ABI/stable/sysfs-class-bluetooth
34673468
F: include/net/bluetooth/
34683469
F: net/bluetooth/
34693470

drivers/bluetooth/bfusb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,8 @@ static void bfusb_rx_complete(struct urb *urb)
365365
buf += 3;
366366
}
367367

368-
if (count < len) {
368+
if (count < len)
369369
bt_dev_err(data->hdev, "block extends over URB buffer ranges");
370-
}
371370

372371
if ((hdr & 0xe1) == 0xc1)
373372
bfusb_recv_block(data, hdr, buf, len);

0 commit comments

Comments
 (0)