Skip to content

Commit dac6567

Browse files
committed
Merge: r8169: update to v6.15-rc7 (part 1)
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6865 These commits will be backported in a different MR due to various phy dependencies: 853e803 r8169: add PHY c45 ops for MDIO_MMD_VENDOR2 registers b11bff9 r8169: add support for RTL8125BP rev.b e340bff r8169: copy vendor driver 2.5G/5G EEE advertisement constraints a3d8520 r8169: align RTL8126 EEE config with vendor driver 4af2f60 r8169: align RTL8125/RTL8126 PHY config with vendor driver eb90f87 r8169: align RTL8125 EEE config with vendor driver JIRA: https://issues.redhat.com/browse/RHEL-84976 JIRA: https://issues.redhat.com/browse/RHEL-73980 JIRA: https://issues.redhat.com/browse/RHEL-89041 Signed-off-by: Izabela Bakollari <ibakolla@redhat.com> Approved-by: Michal Schmidt <mschmidt@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Kamal Heib <kheib@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents f2d7474 + 174adf9 commit dac6567

File tree

4 files changed

+275
-248
lines changed

4 files changed

+275
-248
lines changed

drivers/net/ethernet/realtek/r8169.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ enum mac_version {
6868
RTL_GIGA_MAC_VER_60,
6969
RTL_GIGA_MAC_VER_61,
7070
RTL_GIGA_MAC_VER_63,
71+
RTL_GIGA_MAC_VER_64,
7172
RTL_GIGA_MAC_VER_65,
72-
RTL_GIGA_MAC_VER_66,
73+
RTL_GIGA_MAC_VER_70,
74+
RTL_GIGA_MAC_VER_71,
7375
RTL_GIGA_MAC_NONE
7476
};
7577

drivers/net/ethernet/realtek/r8169_firmware.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ int rtl_fw_request_firmware(struct rtl_fw *rtl_fw)
215215
{
216216
int rc;
217217

218-
rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
218+
rc = firmware_request_nowarn(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
219219
if (rc < 0)
220220
goto out;
221221

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

228228
return 0;
229229
out:
230-
dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
231-
rtl_fw->fw_name, rc);
230+
dev_warn(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
231+
rtl_fw->fw_name, rc);
232232
return rc;
233233
}

0 commit comments

Comments
 (0)