| Message ID | E1tJ9J2-006LIh-Fl@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bac3d0f21c5a42f042ac9b9f6dcbc11544efdefa |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phylib EEE cleanups | expand |
On Thu, Dec 05, 2024 at 10:42:00AM +0000, Russell King (Oracle) wrote: > Rather than calling genphy_c45_ethtool_get_eee() to retrieve whether > EEE is enabled, use the value stored in the phy_device eee_cfg > structure. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> I seem to have missed adding Heiner's r-b given in the RFC posting: Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b885bc0fe6e0..ffe223ad9e5f 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1550,7 +1550,6 @@ static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs) static int m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs) { - struct ethtool_keee eee; int val, ret; if (*msecs == ETHTOOL_PHY_FAST_LINK_DOWN_OFF) @@ -1560,8 +1559,7 @@ static int m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs) /* According to the Marvell data sheet EEE must be disabled for * Fast Link Down detection to work properly */ - ret = genphy_c45_ethtool_get_eee(phydev, &eee); - if (!ret && eee.eee_enabled) { + if (phydev->eee_cfg.eee_enabled) { phydev_warn(phydev, "Fast Link Down detection requires EEE to be disabled!\n"); return -EBUSY; }
Rather than calling genphy_c45_ethtool_get_eee() to retrieve whether EEE is enabled, use the value stored in the phy_device eee_cfg structure. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/marvell.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)