Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Aaron Ma and committed by
Jakub Kicinski
00fcf8c7 af872b69

+6 -3
+6 -3
drivers/net/usb/r8152.c
··· 9638 9638 netdev->hw_features &= ~NETIF_F_RXCSUM; 9639 9639 } 9640 9640 9641 - if (udev->parent && 9642 - le16_to_cpu(udev->parent->descriptor.idVendor) == VENDOR_ID_LENOVO) { 9643 - tp->lenovo_macpassthru = 1; 9641 + if (le16_to_cpu(udev->descriptor.idVendor) == VENDOR_ID_LENOVO) { 9642 + switch (le16_to_cpu(udev->descriptor.idProduct)) { 9643 + case DEVICE_ID_THINKPAD_THUNDERBOLT3_DOCK_GEN2: 9644 + case DEVICE_ID_THINKPAD_USB_C_DOCK_GEN2: 9645 + tp->lenovo_macpassthru = 1; 9646 + } 9644 9647 } 9645 9648 9646 9649 if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial &&