mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
bcb37c84d2
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.143 Removed upstreamed: generic/backport-5.15/795-v6.6-12-r8152-Rename-RTL8152_UNPLUG-to-RTL8152_INACCESSIBLE.patch[1] Manually rebased: mediatek/patches-5.15/100-dts-update-mt7622-rfb1.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.143&id=00beca907a7be61da935bb687f9601420fc5f8a8 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
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
|
|
@@ -9602,20 +9602,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) {
|