From d7c3fc67aa2572c79a2b7fd820d8138909c71ecb Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 17 May 2024 16:48:58 +0800 Subject: [PATCH] r8125: rewrite devname configuration patch Signed-off-by: Tianling Shen --- package/kernel/r8125/Makefile | 2 +- ...10-add-devname-configuration-from-OF.patch | 46 +++++++------------ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index 4420b12b3f..19cd9c08f6 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 PKG_VERSION:=9.013.02-2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)? diff --git a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch index 80c0542ad8..c2cd1e0ed1 100644 --- a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch @@ -1,34 +1,20 @@ --- a/src/r8125_n.c +++ b/src/r8125_n.c -@@ -13628,6 +13628,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri - } +@@ -15305,6 +15305,7 @@ rtl8125_init_board(struct pci_dev *pdev, + void __iomem *ioaddr; + struct net_device *dev; + struct rtl8125_private *tp; ++ const char *devname = of_get_property(pdev->dev.of_node, "label", NULL); + int rc = -ENOMEM, i, pm_cap; - static int -+rtl8125_devname_configuration(struct rtl8125_private *tp) -+{ -+ const char *devname; -+ int ret; -+ -+ ret = of_property_read_string(tp->pci_dev->dev.of_node, -+ "label", &devname); -+ -+ if (ret) -+ return ret; -+ -+ strlcpy(tp->dev->name, devname, IFNAMSIZ); -+ -+ return 0; -+} -+ -+static int - rtl8125_led_configuration(struct rtl8125_private *tp) - { - const int led_regs[] = { 0x18, 0x86, 0x84, 0x96 }; /* LEDSEL 0-3 */ -@@ -14280,6 +14297,7 @@ rtl8125_init_software_variable(struct ne - else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) - tp->rtl8125_rx_config &= ~EnableRxDescV4_1; + assert(ioaddr_out != NULL); +@@ -15319,6 +15320,9 @@ rtl8125_init_board(struct pci_dev *pdev, + goto err_out; + } -+ rtl8125_devname_configuration(tp); - rtl8125_led_configuration(tp); - - tp->NicCustLedValue = RTL_R16(tp, CustomLED); ++ if (devname) ++ strscpy(dev->name, devname, IFNAMSIZ); ++ + SET_MODULE_OWNER(dev); + SET_NETDEV_DEV(dev, &pdev->dev); + tp = netdev_priv(dev);