From nobody Mon Oct 20 18:34:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3xH1hRKz6CvPN; Mon, 20 Oct 2025 18:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3xG3pwDz44ql; Mon, 20 Oct 2025 18:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P+Hy1FAU/g7E6qdkhaESY7yIZ2AR+92Mn3OUP1sRJc=; b=g7bgQ6rqqUZV3pLXeBkFihiOEmwOvYCo1U944pts3IQC3sU4aJB6llYW7JL4VpvhZtBTFX TqWf0g6SOUgCBTKmyLVZ5147XAIrim3nYbcfLkTMqTwxxc6IN28LoVZ4+ADVh6U6Qs4Z4m UvHZilhLcdN05bKw+bFW+/MDTRfUxGqQSzodhtV566hWoAs6IVqaNJAFkCnMaTcxSgOmUN IrxjTljjWRuaMRxx39NYX0kpi//BHAGylTSQKk4GknbWXcI0hPehDWYmIsGB44gGS23YCy bJoAEGDxX+QL2eePeeB9atE/3UTfO+FRy8zHIui9hRhwh4mn57cQ3xEkJbEJBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9P+Hy1FAU/g7E6qdkhaESY7yIZ2AR+92Mn3OUP1sRJc=; b=PV8y0hytWRNj99+Uh3AgED0nvC399ljBmMOpm4XFd+1XBeuW2IP2yJVgOkMDHrQ6/PNMKI ItzFZf/luTqWQgC9F9Z17AzjOzNAKQ3yALTVCbqJXjCJEGAq+JEPC0xrXxQiYiSCRWGL99 xw6i+ljHv4EggV9lzZIAXdVHJDu4WnRO799hu6mJsQKNoxk8/Wf39VO/dMIAW6MLPgu02f Phnb2udKpv7GNnEk0T0SpmP/3Cw9KZfFFtEn+kkJfOWj0tFBKEFPqe/pMwq9sPscQMIzz/ VIYEsJIVjWFJwvrNeYxwzqPDwKhmCX+Ks6SSAexFmOJ66xVQCSBGmxETR311Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985266; a=rsa-sha256; cv=none; b=S/be9REUCwnYx7pZRPsiiAA8Ut1XSHcUjHH72WdRGax77zPnkWfu3ZS+DamP6INIm+MEhB CXXoQWJ4Qoc03O008qzQ9JTMdyqRWdF5fFYbJvPYZwMEDN3iZSQ9/1ztJPvoNz3wpFt/6v +iQkoO5Q9HpcgLHcVAvv00lr62kyvVy8VzXg0X/4em202neMwZX4XAY4fLdY2R3LFuxRPc tO4C4mmndBWIfuFgiTnyPwMV2CF79CJ6+gjQs6qqGaMJFaY2pFmqfO60rUM5uuyECVyk0+ whAuR12Jq4I+0P4djaUT4oLNp9TZM52bOXNivP+UOUW6/V6FhmkLX8aqziXxow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3xG2vjsz8xN; Mon, 20 Oct 2025 18:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIYQsF007615; Mon, 20 Oct 2025 18:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIYQt6007612; Mon, 20 Oct 2025 18:34:26 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:34:26 GMT Message-Id: <202510201834.59KIYQt6007612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bd62c8d63eae - stable/15 - bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd62c8d63eae78225264d8f4c2190f09cb9e1611 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd62c8d63eae78225264d8f4c2190f09cb9e1611 commit bd62c8d63eae78225264d8f4c2190f09cb9e1611 Author: Bjoern A. Zeeb AuthorDate: 2025-09-01 18:27:02 +0000 Commit: Bjoern A. Zeeb 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";