From: Daniel Golle Date: Thu, 8 May 2025 01:59:19 +0000 (+0100) Subject: generic: 6.12: fix patch adding EEE-support to mtk_eth_soc X-Git-Tag: v25.12.0-rc1~2574 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d092e7af4097a76a5eb6d213ed58252f610cc923;p=thirdparty%2Fopenwrt.git generic: 6.12: fix patch adding EEE-support to mtk_eth_soc Upstream now uses struct ethtool_keee instead of struct ethtool_eee as parameter to EEE-related functions. Follow that change and modify the patch accordingly. Signed-off-by: Daniel Golle --- diff --git a/target/linux/generic/backport-6.12/753-v6.15-net-ethernet-mediatek-add-EEE-support.patch b/target/linux/generic/backport-6.12/753-v6.15-net-ethernet-mediatek-add-EEE-support.patch index 9d26480bdf9..2ca3f2ef004 100644 --- a/target/linux/generic/backport-6.12/753-v6.15-net-ethernet-mediatek-add-EEE-support.patch +++ b/target/linux/generic/backport-6.12/753-v6.15-net-ethernet-mediatek-add-EEE-support.patch @@ -43,7 +43,7 @@ Signed-off-by: Qingfang Deng return phylink_ethtool_set_pauseparam(mac->phylink, pause); } -+static int mtk_get_eee(struct net_device *dev, struct ethtool_eee *eee) ++static int mtk_get_eee(struct net_device *dev, struct ethtool_keee *eee) +{ + struct mtk_mac *mac = netdev_priv(dev); + u32 reg; @@ -60,7 +60,7 @@ Signed-off-by: Qingfang Deng + return 0; +} + -+static int mtk_set_eee(struct net_device *dev, struct ethtool_eee *eee) ++static int mtk_set_eee(struct net_device *dev, struct ethtool_keee *eee) +{ + struct mtk_mac *mac = netdev_priv(dev); + u32 txidle_thd_ms, reg;