mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-10 23:12:48 +00:00
56b2d856a2
7a3bcd39ae1f r8169: use helper r8169_mod_reg8_cond to simplify rtl_jumbo_config
e3e9e9039fa6 r8169: align WAKE_PHY handling with r8125/r8126 vendor drivers
330dc2297c82 r8169: improve rtl_set_d3_pll_down
c507e96b5763 r8169: improve __rtl8169_set_wol
83cb4b470c66 r8169: remove leftover locks after reverted change
2cd02f2fdd8a r8169: improve initialization of RSS registers on RTL8125/RTL8126
a3d8520e6a19 r8169: align RTL8126 EEE config with vendor driver
4af2f60bf737 r8169: align RTL8125/RTL8126 PHY config with vendor driver
eb90f876b796 r8169: align RTL8125 EEE config with vendor driver
b8bd8c44a266 r8169: fix inconsistent indenting in rtl8169_get_eth_mac_stats
f75d1fbe7809 r8169: add support for RTL8125D
c4e64095c00c r8169: enable EEE at 2.5G per default on RTL8125B
d64113c6bb5e r8169: remove rtl_dash_loop_wait_high/low
1c105bacb160 r8169: avoid duplicated messages if loading firmware fails and switch to warn level
ac48430368c1 r8169: don't take RTNL lock in rtl_task()
e3fc5139bd8f r8169: implement additional ethtool stats ops
b8bf38440ba9 r8169: enable SG/TSO on selected chip versions per default
854d71c555df r8169: remove original workaround for RTL8125 broken rx issue
1ffcc8d41306 r8169: add support for the temperature sensor being available from RTL8125B
The following patches require backporting additional linux patches:
e2015942e90a r8169: replace custom flag with disable_work() et al
e340bff27e63 r8169: copy vendor driver 2.5G/5G EEE advertisement constraints
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry picked from commit 0eeba04a16)
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 1c105bacb160b5918e917ab811552b7be69fc69c Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Wed, 16 Oct 2024 22:29:39 +0200
|
|
Subject: [PATCH] r8169: avoid duplicated messages if loading firmware fails
|
|
and switch to warn level
|
|
|
|
In case of a problem with firmware loading we inform at the driver level,
|
|
in addition the firmware load code itself issues warnings. Therefore
|
|
switch to firmware_request_nowarn() to avoid duplicated error messages.
|
|
In addition switch to warn level because the firmware is optional and
|
|
typically just fixes compatibility issues.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Message-ID: <d9c5094c-89a6-40e2-b5fe-8df7df4624ef@gmail.com>
|
|
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_firmware.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_firmware.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_firmware.c
|
|
@@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_f
|
|
{
|
|
int rc;
|
|
|
|
- rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
|
|
+ rc = firmware_request_nowarn(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
|
|
if (rc < 0)
|
|
goto out;
|
|
|
|
@@ -227,7 +227,7 @@ int rtl_fw_request_firmware(struct rtl_f
|
|
|
|
return 0;
|
|
out:
|
|
- dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
|
|
- rtl_fw->fw_name, rc);
|
|
+ dev_warn(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
|
|
+ rtl_fw->fw_name, rc);
|
|
return rc;
|
|
}
|