git: bd62c8d63eae - stable/15 - bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table

The branch stable/15 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=bd62c8d63eae78225264d8f4c2190f09cb9e1611

commit bd62c8d63eae78225264d8f4c2190f09cb9e1611
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-09-01 18:27:02 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-10-20 18:33:09 +0000

    bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table
    
    Remove the single 8822CU entry in all three places.
    It seems the only entry referencing a USB device.  The same device is
    listed with the 8822CE devices.
    
    Reviewed by:    wulf
    Differential Revision: https://reviews.freebsd.org/D52324
    
    (cherry picked from commit 0ee6e36ea9b2dd959b0fb9f04ab98a01f93729fc)
---
 sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c |  3 ---
 usr.sbin/bluetooth/rtlbtfw/main.c               |  3 ---
 usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf         | 10 ----------
 3 files changed, 16 deletions(-)

diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
index 0181a67ac604..f35712cc8f69 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
@@ -81,9 +81,6 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] =
 	{ USB_VPI(0x0bda, 0xb00c, 0) },
 	{ USB_VPI(0x0bda, 0xc822, 0) },
 
-	/* Realtek 8822CU Bluetooth devices */
-	{ USB_VPI(0x13d3, 0x3549, 0) },
-
 	/* Realtek 8851BE Bluetooth devices */
 	{ USB_VPI(0x13d3, 0x3600, 0) },
 
diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c
index e87a98036265..280045a6aa25 100644
--- a/usr.sbin/bluetooth/rtlbtfw/main.c
+++ b/usr.sbin/bluetooth/rtlbtfw/main.c
@@ -64,9 +64,6 @@ static struct rtlbt_devid rtlbt_list[] = {
 	{ .vendor_id = 0x0bda, .product_id = 0xb00c },
 	{ .vendor_id = 0x0bda, .product_id = 0xc822 },
 
-	/* Realtek 8822CU Bluetooth devices */
-	{ .vendor_id = 0x13d3, .product_id = 0x3549 },
-
 	/* Realtek 8851BE Bluetooth devices */
 	{ .vendor_id = 0x13d3, .product_id = 0x3600 },
 
diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
index 61ae53db8f39..2ef56d2af93a 100644
--- a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+++ b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
@@ -36,16 +36,6 @@ notify 100 {
 	action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware";
 };
 
-# Realtek 8822CU Bluetooth devices
-notify 100 {
-	match "system"		"USB";
-	match "subsystem"	"DEVICE";
-	match "type"		"ATTACH";
-	match "vendor"		"0x13d3";
-	match "product"		"0x3549";
-	action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware";
-};
-
 # Realtek 8851BE Bluetooth devices
 notify 100 {
 	match "system"		"USB";