him411/openwrt-6.x
1
0
Fork 0
mirror of https://github.com/LiBwrt-op/openwrt-6.x.git synced 2026-01-08 12:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

r8125: rewrite devname configuration patch

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-05-17 16:48:58 +08:00
parent 7b507b6869
commit d7c3fc67aa
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/r8125/Makefile
View File

@ -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)?

46
package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch
View File

@ -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);