Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: 6.12: replace ethtool_eee with ethtool_keee

Browse source 
EEE functions are now called with ethtool_keee instead of
ethtool_eee. Replace all occurrences. This will fix function
signature checks but still produces compilation errors due
to structure changes.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/18935
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen 2025-05-27 14:35:53 -04:00 committed by Robert Marko
parent e9a093818c
commit a4a40ab6ea
3 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c
View file

@ -1111,8 +1111,7 @@ static void rtl83xx_port_disable(struct dsa_switch *ds, int port)
priv->ports[port].enable = false;
}
static int rtl83xx_set_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e)
static int rtl83xx_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
{
struct rtl838x_switch_priv *priv = ds->priv;
@ -1131,8 +1130,7 @@ static int rtl83xx_set_mac_eee(struct dsa_switch *ds, int port,
return 0;
}
static int rtl83xx_get_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e)
static int rtl83xx_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
{
struct rtl838x_switch_priv *priv = ds->priv;
@ -1147,8 +1145,7 @@ static int rtl83xx_get_mac_eee(struct dsa_switch *ds, int port,
return 0;
}
static int rtl93xx_get_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e)
static int rtl93xx_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)
{
struct rtl838x_switch_priv *priv = ds->priv;

21
target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
View file

@ -630,8 +630,7 @@ out:
return ret;
}
static int rtl8226_get_eee(struct phy_device *phydev,
struct ethtool_eee *e)
static int rtl8226_get_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
u32 val;
int addr = phydev->mdio.addr;
@ -651,7 +650,7 @@ static int rtl8226_get_eee(struct phy_device *phydev,
return 0;
}
static int rtl8226_set_eee(struct phy_device *phydev, struct ethtool_eee *e)
static int rtl8226_set_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
int port = phydev->mdio.addr;
u64 poll_state;
@ -1182,8 +1181,7 @@ static void rtl8218d_eee_set(struct phy_device *phydev, bool enable)
phy_write_paged(phydev, RTL821X_PAGE_GPHY, RTL821XEXT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
}
static int rtl8218b_get_eee(struct phy_device *phydev,
struct ethtool_eee *e)
static int rtl8218b_get_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
u32 val;
int addr = phydev->mdio.addr;
@ -1210,8 +1208,7 @@ static int rtl8218b_get_eee(struct phy_device *phydev,
return 0;
}
static int rtl8218d_get_eee(struct phy_device *phydev,
struct ethtool_eee *e)
static int rtl8218d_get_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
u32 val;
int addr = phydev->mdio.addr;
@ -1232,8 +1229,7 @@ static int rtl8218d_get_eee(struct phy_device *phydev,
return 0;
}
static int rtl8214fc_set_eee(struct phy_device *phydev,
struct ethtool_eee *e)
static int rtl8214fc_set_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
u32 poll_state;
int port = phydev->mdio.addr;
@ -1289,8 +1285,7 @@ static int rtl8214fc_set_eee(struct phy_device *phydev,
return 0;
}
static int rtl8214fc_get_eee(struct phy_device *phydev,
struct ethtool_eee *e)
static int rtl8214fc_get_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
int addr = phydev->mdio.addr;
@ -1303,7 +1298,7 @@ static int rtl8214fc_get_eee(struct phy_device *phydev,
return rtl8218b_get_eee(phydev, e);
}
static int rtl8218b_set_eee(struct phy_device *phydev, struct ethtool_eee *e)
static int rtl8218b_set_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
int port = phydev->mdio.addr;
u64 poll_state;
@ -1357,7 +1352,7 @@ static int rtl8218b_set_eee(struct phy_device *phydev, struct ethtool_eee *e)
return 0;
}
static int rtl8218d_set_eee(struct phy_device *phydev, struct ethtool_eee *e)
static int rtl8218d_set_eee(struct phy_device *phydev, struct ethtool_keee *e)
{
int addr = phydev->mdio.addr;
u64 poll_state;

8
target/linux/realtek/patches-6.12/706-include-linux-add-phy-ops-for-rtl838x.patch
View file

@ -21,12 +21,12 @@ Submitted-by: John Crispin <john@phrozen.org>
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1181,6 +1181,8 @@ struct phy_driver {
@@ -1229,6 +1229,8 @@ struct phy_driver {
*/
int (*led_polarity_set)(struct phy_device *dev, int index,
unsigned long modes);
+ int (*get_eee)(struct phy_device *dev, struct ethtool_eee *e);
+ int (*set_eee)(struct phy_device *dev, struct ethtool_eee *e);
+ int (*get_eee)(struct phy_device *dev, struct ethtool_keee *e);
+ int (*set_eee)(struct phy_device *dev, struct ethtool_keee *e);
};
#define to_phy_driver(d) container_of(to_mdio_common_driver(d), \
#define to_phy_driver(d) container_of_const(to_mdio_common_driver(d), \
struct phy_driver, mdiodrv)