Commit 00fcf8c7 authored by Aaron Ma's avatar Aaron Ma Committed by Jakub Kicinski
Browse files

Revert "net: usb: r8152: Add MAC passthrough support for more Lenovo Docks" 



This reverts commit f77b83b5.

This change breaks multiple usb to ethernet dongles attached on Lenovo
USB hub.

Fixes: f77b83b5 ("net: usb: r8152: Add MAC passthrough support for more Lenovo Docks")
Signed-off-by: default avatarAaron Ma <aaron.ma@canonical.com>
Link: https://lore.kernel.org/r/20220105155102.8557-1-aaron.ma@canonical.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af872b69

drivers/net/usb/r8152.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -9638,10 +9638,13 @@ static int rtl8152_probe(struct usb_interface *intf, 
		netdev->hw_features &= ~NETIF_F_RXCSUM;

		netdev->hw_features &= ~NETIF_F_RXCSUM;

	}

	}





	if (udev->parent &&

	if (le16_to_cpu(udev->descriptor.idVendor) == VENDOR_ID_LENOVO) {

			le16_to_cpu(udev->parent->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;

			tp->lenovo_macpassthru = 1;

		}

		}

	}





	if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial &&

	if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial &&

	    (!strcmp(udev->serial, "000001000000") ||

	    (!strcmp(udev->serial, "000001000000") ||