[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 1 Jan 2024 22:26:47 +0100
From: Heiner Kallweit <hkallweit1@...il.com>
To: Andrew Lunn <andrew@...n.ch>, Russell King <rmk+kernel@...linux.org.uk>,
David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: [PATCH net-next 4/5] net: phy: c45: prepare
genphy_c45_ethtool_set_eee for follow-up extension
This prepares genphy_c45_ethtool_set_eee() for functional changes in a
follow-up patch. No functional change intended.
Signed-off-by: Heiner Kallweit <hkallweit1@...il.com>
---
drivers/net/phy/phy-c45.c | 41 +++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 747d14bf1..9d8b2b5eb 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -1492,32 +1492,31 @@ EXPORT_SYMBOL(genphy_c45_ethtool_get_eee);
int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
struct ethtool_eee *data)
{
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(adv);
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);
+ bool unsupported;
int ret;
- if (data->eee_enabled) {
- if (data->advertised) {
- __ETHTOOL_DECLARE_LINK_MODE_MASK(adv);
-
- ethtool_convert_legacy_u32_to_link_mode(adv,
- data->advertised);
- linkmode_andnot(adv, adv, phydev->supported_eee);
- if (!linkmode_empty(adv)) {
- phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
- return -EINVAL;
- }
-
- ethtool_convert_legacy_u32_to_link_mode(phydev->advertising_eee,
- data->advertised);
- } else {
- linkmode_copy(phydev->advertising_eee,
- phydev->supported_eee);
- }
+ phydev->eee_enabled = data->eee_enabled;
+ if (!data->eee_enabled)
+ goto eee_aneg;
- phydev->eee_enabled = true;
- } else {
- phydev->eee_enabled = false;
+ ethtool_convert_legacy_u32_to_link_mode(adv, data->advertised);
+
+ if (linkmode_empty(adv)) {
+ linkmode_copy(phydev->advertising_eee, phydev->supported_eee);
+ goto eee_aneg;
}
+ unsupported = linkmode_andnot(tmp, adv, phydev->supported_eee);
+ if (unsupported) {
+ phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
+ return -EINVAL;
+ }
+
+ linkmode_copy(phydev->advertising_eee, adv);
+
+eee_aneg:
ret = genphy_c45_an_config_eee_aneg(phydev);
if (ret < 0)
return ret;
--
2.43.0
Powered by blists - more mailing lists