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

pyma1 · kuba-moo · commit 00fcf8c7dd56 · 2022-01-05T10:11:40.000-08:00
This reverts commit f77b83b. This change breaks multiple usb to ethernet dongles attached on Lenovo USB hub. Fixes: f77b83b ("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>
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -9638,9 +9638,12 @@ static int rtl8152_probe(struct usb_interface *intf,`
`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 &&`