mirror of
https://git.proxmox.com/git/package-rebuilds
synced 2025-08-22 15:48:57 +00:00
b022e135fe
Which includes the backported fix from our 693166c ("r8125: backport
fix for 6.8 and bump package version to 9.011.00-4.1") already, so no
need to port that over.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
126 lines
4.8 KiB
Diff
126 lines
4.8 KiB
Diff
From 94426e16197c244d03aad0434e3490acdaa830fe Mon Sep 17 00:00:00 2001
|
|
From: Masato TOYOSHIMA <phoepsilonix@phoepsilonix.love>
|
|
Date: Tue, 14 May 2024 14:52:58 +0900
|
|
Subject: [PATCH] Linux 6.9 compat: change to ethtool_keee from ethtool_eee
|
|
|
|
linux/include/linux/ethtool.h
|
|
|
|
struct ethtool_ops
|
|
int (*get_eee)(struct net_device *dev, struct ethtool_keee *eee);
|
|
int (*set_eee)(struct net_device *dev, struct ethtool_keee *eee);
|
|
|
|
change to ethtool_keee from ethtool_eee
|
|
rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
|
|
rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
|
|
---
|
|
src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 44 insertions(+)
|
|
|
|
Origin: other, https://github.com/mtorromeo/r8168/pull/60.patch
|
|
Origin: vendor, https://aur.archlinux.org/packages/r8125-dkms#comment-977750
|
|
|
|
--- a/src/r8125_n.c
|
|
+++ b/src/r8125_n.c
|
|
@@ -7478,7 +7478,11 @@ rtl8125_device_lpi_t_to_ethtool_lpi_t(st
|
|
}
|
|
|
|
static int
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
|
|
+#else
|
|
rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
|
|
+#endif
|
|
{
|
|
struct rtl8125_private *tp = netdev_priv(net);
|
|
struct ethtool_eee *eee = &tp->eee;
|
|
@@ -7511,9 +7515,15 @@ rtl_ethtool_get_eee(struct net_device *n
|
|
|
|
edata->eee_enabled = !!val;
|
|
edata->eee_active = !!(supported & adv & lp);
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+ ethtool_convert_legacy_u32_to_link_mode(edata->supported, supported);
|
|
+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
|
|
+ ethtool_convert_legacy_u32_to_link_mode(edata->lp_advertised, lp);
|
|
+#else
|
|
edata->supported = supported;
|
|
edata->advertised = adv;
|
|
edata->lp_advertised = lp;
|
|
+#endif
|
|
edata->tx_lpi_enabled = edata->eee_enabled;
|
|
edata->tx_lpi_timer = tx_lpi_timer;
|
|
|
|
@@ -7521,11 +7531,18 @@ rtl_ethtool_get_eee(struct net_device *n
|
|
}
|
|
|
|
static int
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
|
|
+#else
|
|
rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
|
|
+#endif
|
|
{
|
|
struct rtl8125_private *tp = netdev_priv(net);
|
|
struct ethtool_eee *eee = &tp->eee;
|
|
u64 advertising;
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+ u32 adv;
|
|
+#endif
|
|
int rc = 0;
|
|
|
|
if (!HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp) ||
|
|
@@ -7557,6 +7574,18 @@ rtl_ethtool_set_eee(struct net_device *n
|
|
*/
|
|
|
|
advertising = tp->advertising;
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+ ethtool_convert_link_mode_to_legacy_u32(&adv, edata->advertised);
|
|
+ if (linkmode_empty(edata->advertised)) {
|
|
+ adv = advertising & eee->supported;
|
|
+ ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
|
|
+ } else if (!linkmode_empty(edata->advertised) & ~advertising) {
|
|
+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %llu\n",
|
|
+ adv, advertising);
|
|
+ rc = -EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+#else
|
|
if (!edata->advertised) {
|
|
edata->advertised = advertising & eee->supported;
|
|
} else if (edata->advertised & ~advertising) {
|
|
@@ -7565,13 +7594,23 @@ rtl_ethtool_set_eee(struct net_device *n
|
|
rc = -EINVAL;
|
|
goto out;
|
|
}
|
|
+#endif
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+ if (!linkmode_empty(edata->advertised) & ~eee->supported) {
|
|
+ dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
|
|
+ adv, eee->supported);
|
|
+ rc = -EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+#else
|
|
if (edata->advertised & ~eee->supported) {
|
|
dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
|
|
edata->advertised, eee->supported);
|
|
rc = -EINVAL;
|
|
goto out;
|
|
}
|
|
+#endif
|
|
|
|
//tp->eee.eee_enabled = edata->eee_enabled;
|
|
//tp->eee_adv_t = ethtool_adv_to_mmd_eee_adv_t(edata->advertised);
|
|
@@ -7579,7 +7618,11 @@ rtl_ethtool_set_eee(struct net_device *n
|
|
dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE tx_lpi_timer %x must be a subset of support %x\n",
|
|
edata->tx_lpi_timer, eee->tx_lpi_timer);
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
|
|
+ ethtool_convert_link_mode_to_legacy_u32(&eee->advertised, edata->advertised);
|
|
+#else
|
|
eee->advertised = edata->advertised;
|
|
+#endif
|
|
//eee->tx_lpi_enabled = edata->tx_lpi_enabled;
|
|
//eee->tx_lpi_timer = edata->tx_lpi_timer;
|
|
eee->eee_enabled = edata->eee_enabled;
|