Messages in this thread | | | Date | Sun, 28 Nov 2021 12:50:23 +0300 | Subject | Re: [PATCH AUTOSEL 5.15 23/39] net: usb: r8152: Add MAC passthrough support for more Lenovo Docks | From | Sergey Shtylyov <> |
| |
On 28.11.2021 12:49, Sergey Shtylyov wrote:
>> From: Aaron Ma <aaron.ma@canonical.com> >> >> [ Upstream commit f77b83b5bbab53d2be339184838b19ed2c62c0a5 ] >> >> Like ThinkaPad Thunderbolt 4 Dock, more Lenovo docks start to use the original >> Realtek USB ethernet chip ID 0bda:8153. >> >> Lenovo Docks always use their own IDs for usb hub, even for older Docks. >> If parent hub is from Lenovo, then r8152 should try MAC passthrough. >> Verified on Lenovo TBT3 dock too. >> >> Signed-off-by: Aaron Ma <aaron.ma@canonical.com> >> Signed-off-by: David S. Miller <davem@davemloft.net> >> Signed-off-by: Sasha Levin <sashal@kernel.org> >> --- >> drivers/net/usb/r8152.c | 9 +++------ >> 1 file changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c >> index f329e39100a7d..d3da350777a4d 100644 >> --- a/drivers/net/usb/r8152.c >> +++ b/drivers/net/usb/r8152.c >> @@ -9603,12 +9603,9 @@ static int rtl8152_probe(struct usb_interface *intf, >> netdev->hw_features &= ~NETIF_F_RXCSUM; >> } >> - 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 (udev->parent && >> + le16_to_cpu(udev->parent->descriptor.idVendor) == >> VENDOR_ID_LENOVO) { >> + tp->lenovo_macpassthru = 1; >> } > > {} not needed anymore, please remove 'em.
Oops, sorry didn't notice that this is a stable patch. :-)
> [...]
MBR, Sergey
| |