35dc676ba3
Drop upstreamed patches, refresh remaining patches. Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org> [rebased upon HEAD] Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
34 lines
789 B
Diff
34 lines
789 B
Diff
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -2183,6 +2183,22 @@ void r8169_apply_firmware(struct rtl8169
|
|
}
|
|
}
|
|
|
|
+static int rtl8169_devname_configuration(struct rtl8169_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 rtl8169_led_configuration(struct rtl8169_private *tp)
|
|
{
|
|
u32 led_data;
|
|
@@ -3691,6 +3707,7 @@ static void rtl_hw_start_8125b(struct rt
|
|
rtl_set_def_aspm_entry_latency(tp);
|
|
rtl_ephy_init(tp, e_info_8125b);
|
|
rtl_hw_start_8125_common(tp);
|
|
+ rtl8169_devname_configuration(tp);
|
|
rtl8169_led_configuration(tp);
|
|
}
|
|
|