summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-10-14 23:47:55 +0000
committerjsg <jsg@openbsd.org>2020-10-14 23:47:55 +0000
commitac654b0188d5b54b5a09acd6b5534f64278fc7ed (patch)
tree2c6c4852a32b92086716ebc64f5aba3693a06ab4
parentIntroduce scsi_copy_internal_data() to copy 'faked' data from a driver to a (diff)
downloadwireguard-openbsd-ac654b0188d5b54b5a09acd6b5534f64278fc7ed.tar.xz
wireguard-openbsd-ac654b0188d5b54b5a09acd6b5534f64278fc7ed.zip
don't match on 17ef:3083 in ure(4)
Stefan Hagen reports this is an audio device found on the Lenovo ThinkPad Thunderbolt 3 Workstation Dock Gen 2. Originally added as the id appeared in rtux64w10.INF from thinkpad_usb-c_dock_gen2_drivers_v1.0.3.03241.exe as %Lenovo-FFF.DeviceDesc% = RTL8153Bx64_S5WOL.ndi,USB\VID_17EF&PID_3083&REV_3101 but this appears to be wrong.
-rw-r--r--sys/dev/usb/if_ure.c3
-rw-r--r--sys/dev/usb/usbdevs19
2 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c
index db8b733aa6f..48582e85a73 100644
--- a/sys/dev/usb/if_ure.c
+++ b/sys/dev/usb/if_ure.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ure.c,v 1.20 2020/10/05 05:29:34 jsg Exp $ */
+/* $OpenBSD: if_ure.c,v 1.21 2020/10/14 23:47:55 jsg Exp $ */
/*-
* Copyright (c) 2015, 2016, 2019 Kevin Lo <kevlo@openbsd.org>
* Copyright (c) 2020 Jonathon Fletcher <jonathon.fletcher@gmail.com>
@@ -98,7 +98,6 @@ const struct usb_devno ure_devs[] = {
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153B_7 },
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153B_8 },
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153B_9 },
- { USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153B_10 },
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153_1 },
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153_2 },
{ USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153_3 },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c351df9fae9..113b8e83c34 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.721 2020/10/05 05:28:13 jsg Exp $
+$OpenBSD: usbdevs,v 1.722 2020/10/14 23:47:55 jsg Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -2589,20 +2589,19 @@ product LENOVO DOCK_ETHERNET 0x3062 USB-C Dock Ethernet
product LENOVO TB3GFXDOCK 0x3065 Thunderbolt 3 Graphics Dock
product LENOVO RTL8153B_1 0x3069 RTL8153B
product LENOVO TB3DOCKGEN2 0x3082 Thunderbolt 3 Dock Gen 2
-product LENOVO RTL8153B_2 0x3083 RTL8153B
-product LENOVO RTL8153B_3 0x3098 RTL8153B
-product LENOVO RTL8153B_4 0x309b RTL8153B
-product LENOVO RTL8153B_5 0x309c RTL8153B
-product LENOVO RTL8153B_6 0x309d RTL8153B
+product LENOVO RTL8153B_2 0x3098 RTL8153B
+product LENOVO RTL8153B_3 0x309b RTL8153B
+product LENOVO RTL8153B_4 0x309c RTL8153B
+product LENOVO RTL8153B_5 0x309d RTL8153B
product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet
product LENOVO RTL8153_1 0x7205 RTL8153
product LENOVO ONELINK 0x720a OneLink
product LENOVO RTL8153_2 0x720b RTL8153
product LENOVO RTL8153_3 0x720c RTL8153
-product LENOVO RTL8153B_7 0x7214 RTL8153B
-product LENOVO RTL8153B_8 0x721e RTL8153B
-product LENOVO RTL8153B_9 0x8153 RTL8153B
-product LENOVO RTL8153B_10 0xa359 RTL8153B
+product LENOVO RTL8153B_6 0x7214 RTL8153B
+product LENOVO RTL8153B_7 0x721e RTL8153B
+product LENOVO RTL8153B_8 0x8153 RTL8153B
+product LENOVO RTL8153B_9 0xa359 RTL8153B
product LENOVO USBCDOCKGEN2 0xa387 USB-C Dock Gen 2
product LENOVO TB3DOCK 0xa3c1 Thunderbolt 3 Dock