Skip to content

[Deepin-Kernel-SIG] [linux 6.12-y] [Upstream] Merge r8169 from mainline v6.13 to more r8125 support #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opsiff wants to merge 23 commits into
base: linux-6.12.y
Choose a base branch
from
Open

[Deepin-Kernel-SIG] [linux 6.12-y] [Upstream] Merge r8169 from mainline v6.13 to more r8125 support #1328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
40df7e1
r8169: add support for the temperature sensor being available from RT…
hkallweit Oct 7, 2024
39157df
r8169: remove original workaround for RTL8125 broken rx issue
hkallweit Oct 9, 2024
23ea58c
r8169: enable SG/TSO on selected chip versions per default
hkallweit Oct 10, 2024
762f796
r8169: implement additional ethtool stats ops
hkallweit Oct 13, 2024
065601a
r8169: don't take RTNL lock in rtl_task()
hkallweit Oct 16, 2024
a732f25
r8169: replace custom flag with disable_work() et al
hkallweit Oct 16, 2024
d912d85
r8169: avoid duplicated messages if loading firmware fails and switch…
hkallweit Oct 16, 2024
9033d5b
r8169: remove rtl_dash_loop_wait_high/low
hkallweit Oct 16, 2024
df3e376
r8169: enable EEE at 2.5G per default on RTL8125B
hkallweit Oct 17, 2024
d850455
r8169: fix inconsistent indenting in rtl8169_get_eth_mac_stats
hkallweit Oct 24, 2024
607c432
r8169: align RTL8125 EEE config with vendor driver
hkallweit Oct 31, 2024
dedec3b
r8169: align RTL8125/RTL8126 PHY config with vendor driver
hkallweit Oct 31, 2024
7398220
r8169: align RTL8126 EEE config with vendor driver
hkallweit Oct 31, 2024
d773431
r8169: improve initialization of RSS registers on RTL8125/RTL8126
hkallweit Nov 2, 2024
d773d53
r8169: remove leftover locks after reverted change
hkallweit Nov 4, 2024
5f61f03
r8169: improve __rtl8169_set_wol
hkallweit Nov 6, 2024
d078a67
r8169: improve rtl_set_d3_pll_down
hkallweit Nov 6, 2024
6cf8741
r8169: align WAKE_PHY handling with r8125/r8126 vendor drivers
hkallweit Nov 6, 2024
4d61658
r8169: use helper r8169_mod_reg8_cond to simplify rtl_jumbo_config
hkallweit Nov 9, 2024
f075752
net: phy: convert eee_broken_modes to a linkmode bitmap
hkallweit Nov 8, 2024
5dceccc
net: phy: add phy_set_eee_broken
hkallweit Nov 8, 2024
44b8f52
r8169: copy vendor driver 2.5G/5G EEE advertisement constraints
hkallweit Nov 8, 2024
3d14fcc
r8169: remove redundant hwmon support
hkallweit Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/net/ethernet/realtek/r8169_firmware.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_fw *rtl_fw)
{
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;

Expand All @@ -227,7 +227,7 @@ int rtl_fw_request_firmware(struct rtl_fw *rtl_fw)

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;
}
Loading
Loading