mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
34d2964554
Fixes issues with RTL8156 2.5G USB adapters
- # ethtool eth1
Settings for eth1:
Supported ports: [ ]
Supported link modes: Not reported
Supported pause frame use: No
Supports auto-negotiation: No
Supported FEC modes: Not reported
Advertised link modes: Not reported
Advertised pause frame use: No
Advertised auto-negotiation: No
Advertised FEC modes: Not reported
Speed: 2500Mb/s
Duplex: Half
Port: Twisted Pair
PHYAD: 0
Transceiver: internal
Auto-negotiation: off
MDI-X: Unknown
Current message level: 0x00000007 (7)
drv probe link
Link detected: yes
- #
- r8152: break the loop when the budget is exhausted
- r8152: Block future register access if register access fails
- r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE
- r8152: add vendor/device ID pair for D-Link DUB-E250
- r8152: try to use a normal budget
- r8152: set bp in bulk
- r8152: adjust generic_ocp_write function
- r8152: fix the autosuspend doesn't work
- r8152: Add __GFP_NOWARN to big allocations
- r8152: reduce the control transfer of rtl8152_get_version()
- r8152: remove rtl_vendor_mode function
- r8152: avoid to change cfg for all devices
- r8152: add USB device driver for config selection
- r8152: use napi_gro_frags
- cdc_ether: no need to blacklist any r8152 devices
- cdc_ether: add u-blox 0x1313 composition
Build system: x86_64
Build-tested: bcm2711, rockchip, x86/64
Run-tested: bcm2711/RPi4B, rockchip/nanopi r2s, x86/64
Signed-off-by: Marty Jones <mj8263788@gmail.com>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 02767440e1dda9861a11ca1dbe0f19a760b1d5c2 Mon Sep 17 00:00:00 2001
|
|
From: Hayes Wang <hayeswang@realtek.com>
|
|
Date: Thu, 19 Jan 2023 15:40:43 +0800
|
|
Subject: [PATCH] r8152: reduce the control transfer of rtl8152_get_version()
|
|
|
|
Reduce the control transfer by moving calling rtl8152_get_version() in
|
|
rtl8152_probe(). This could prevent from calling rtl8152_get_version()
|
|
for unnecessary situations. For example, after setting config #2 for the
|
|
device, there are two interfaces and rtl8152_probe() may be called
|
|
twice. However, we don't need to call rtl8152_get_version() for this
|
|
situation.
|
|
|
|
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/usb/r8152.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/usb/r8152.c
|
|
+++ b/drivers/net/usb/r8152.c
|
|
@@ -9588,20 +9588,21 @@ static int rtl8152_probe(struct usb_inte
|
|
const struct usb_device_id *id)
|
|
{
|
|
struct usb_device *udev = interface_to_usbdev(intf);
|
|
- u8 version = rtl8152_get_version(intf);
|
|
struct r8152 *tp;
|
|
struct net_device *netdev;
|
|
+ u8 version;
|
|
int ret;
|
|
|
|
- if (version == RTL_VER_UNKNOWN)
|
|
- return -ENODEV;
|
|
-
|
|
if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
|
|
return -ENODEV;
|
|
|
|
if (!rtl_check_vendor_ok(intf))
|
|
return -ENODEV;
|
|
|
|
+ version = rtl8152_get_version(intf);
|
|
+ if (version == RTL_VER_UNKNOWN)
|
|
+ return -ENODEV;
|
|
+
|
|
usb_reset_device(udev);
|
|
netdev = alloc_etherdev(sizeof(struct r8152));
|
|
if (!netdev) {
|