immortalwrt-mt798x-24.10/target/linux/rockchip/patches-6.6/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch
Tianling Shen 220a0983a5
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2024-10-31 16:34:58 +08:00

29 lines
794 B
Diff

--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -21,6 +21,7 @@
#include <linux/in.h>
#include <linux/io.h>
#include <linux/ip.h>
+#include <linux/of.h>
#include <linux/tcp.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
@@ -5373,6 +5374,7 @@ static int rtl_init_one(struct pci_dev *
int jumbo_max, region, rc;
enum mac_version chipset;
struct net_device *dev;
+ const char *devname = of_get_property(pdev->dev.of_node, "label", NULL);
u32 txconfig;
u16 xid;
@@ -5380,6 +5382,9 @@ static int rtl_init_one(struct pci_dev *
if (!dev)
return -ENOMEM;
+ if (devname)
+ strscpy(dev->name, devname, IFNAMSIZ);
+
SET_NETDEV_DEV(dev, &pdev->dev);
dev->netdev_ops = &rtl_netdev_ops;
tp = netdev_priv(dev);