Skip to content

Commit 8de8459

Browse files
author
CKI KWF Bot
committed
Merge: cdc_ether driver update
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1068 JIRA: https://issues.redhat.com/browse/RHEL-72661 cdc-ether driver update requested by Lenovo. Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2025-06-18 08:14 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents a326f6a + 2e0048b commit 8de8459

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

drivers/net/usb/cdc_ether.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,13 @@ static const struct usb_device_id products[] = {
783783
.driver_info = 0,
784784
},
785785

786+
/* Lenovo ThinkPad Hybrid USB-C with USB-A Dock (40af0135eu, based on Realtek RTL8153) */
787+
{
788+
USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0xa359, USB_CLASS_COMM,
789+
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
790+
.driver_info = 0,
791+
},
792+
786793
/* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */
787794
{
788795
USB_DEVICE_AND_INTERFACE_INFO(AQUANTIA_VENDOR_ID, 0xc101,

drivers/net/usb/r8152.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ enum rtl8152_flags {
785785
#define DEVICE_ID_THINKPAD_USB_C_DONGLE 0x720c
786786
#define DEVICE_ID_THINKPAD_USB_C_DOCK_GEN2 0xa387
787787
#define DEVICE_ID_THINKPAD_USB_C_DOCK_GEN3 0x3062
788+
#define DEVICE_ID_THINKPAD_HYBRID_USB_C_DOCK 0xa359
788789

789790
struct tally_counter {
790791
__le64 tx_packets;
@@ -9787,6 +9788,7 @@ static bool rtl8152_supports_lenovo_macpassthru(struct usb_device *udev)
97879788
case DEVICE_ID_THINKPAD_USB_C_DOCK_GEN2:
97889789
case DEVICE_ID_THINKPAD_USB_C_DOCK_GEN3:
97899790
case DEVICE_ID_THINKPAD_USB_C_DONGLE:
9791+
case DEVICE_ID_THINKPAD_HYBRID_USB_C_DOCK:
97909792
return 1;
97919793
}
97929794
} else if (vendor_id == VENDOR_ID_REALTEK && parent_vendor_id == VENDOR_ID_LENOVO) {
@@ -10064,6 +10066,8 @@ static const struct usb_device_id rtl8152_table[] = {
1006410066
{ USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927) },
1006510067
{ USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0c5e) },
1006610068
{ USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101) },
10069+
10070+
/* Lenovo */
1006710071
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x304f) },
1006810072
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x3054) },
1006910073
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x3062) },
@@ -10074,7 +10078,9 @@ static const struct usb_device_id rtl8152_table[] = {
1007410078
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x720c) },
1007510079
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x7214) },
1007610080
{ USB_DEVICE(VENDOR_ID_LENOVO, 0x721e) },
10081+
{ USB_DEVICE(VENDOR_ID_LENOVO, 0xa359) },
1007710082
{ USB_DEVICE(VENDOR_ID_LENOVO, 0xa387) },
10083+
1007810084
{ USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041) },
1007910085
{ USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff) },
1008010086
{ USB_DEVICE(VENDOR_ID_TPLINK, 0x0601) },

drivers/net/usb/r8153_ecm.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ static const struct usb_device_id products[] = {
135135
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
136136
.driver_info = (unsigned long)&r8153_info,
137137
},
138+
/* Lenovo ThinkPad Hybrid USB-C with USB-A Dock (40af0135eu, based on Realtek RTL8153) */
139+
{
140+
USB_DEVICE_AND_INTERFACE_INFO(VENDOR_ID_LENOVO, 0xa359, USB_CLASS_COMM,
141+
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
142+
.driver_info = (unsigned long)&r8153_info,
143+
},
138144

139145
{ }, /* END */
140146
};

0 commit comments

Comments
 (0)