diff options
| author | Aaron Ma <aaron.ma@canonical.com> | 2022-01-05 16:51:02 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-01-05 19:11:40 +0100 |
| commit | 00fcf8c7dd564c44448ff6a39728d2ca0c8efbd8 (patch) | |
| tree | 39be833a914d1efbb01a27656072282ebb88ad57 /drivers/net/usb | |
| parent | Merge tag 'ieee802154-for-net-2022-01-05' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-00fcf8c7dd564c44448ff6a39728d2ca0c8efbd8.tar.xz linux-00fcf8c7dd564c44448ff6a39728d2ca0c8efbd8.zip | |
Revert "net: usb: r8152: Add MAC passthrough support for more Lenovo Docks"
This reverts commit f77b83b5bbab53d2be339184838b19ed2c62c0a5.
This change breaks multiple usb to ethernet dongles attached on Lenovo
USB hub.
Fixes: f77b83b5bbab ("net: usb: r8152: Add MAC passthrough support for more Lenovo Docks")
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Link: https://lore.kernel.org/r/20220105155102.8557-1-aaron.ma@canonical.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/r8152.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 3085e8118d7f..ef6010a3d33a 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -9638,9 +9638,12 @@ static int rtl8152_probe(struct usb_interface *intf, netdev->hw_features &= ~NETIF_F_RXCSUM; } - if (udev->parent && - le16_to_cpu(udev->parent->descriptor.idVendor) == VENDOR_ID_LENOVO) { - tp->lenovo_macpassthru = 1; + if (le16_to_cpu(udev->descriptor.idVendor) == VENDOR_ID_LENOVO) { + switch (le16_to_cpu(udev->descriptor.idProduct)) { + case DEVICE_ID_THINKPAD_THUNDERBOLT3_DOCK_GEN2: + case DEVICE_ID_THINKPAD_USB_C_DOCK_GEN2: + tp->lenovo_macpassthru = 1; + } } if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial && |