| Message ID | b086b296-0a1b-42d4-8e2b-ef6682598185@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9b0f510971470b495a707a4475d5a065c6e4d1f6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] lan78xx: remove redundant statement in lan78xx_get_eee | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 5 Jan 2024 23:21:52 +0100 you wrote: > eee_active is set by phy_ethtool_get_eee() already, using the same > logic plus an additional check against link speed/duplex values. > See genphy_c45_eee_is_active() for details. > So we can remove this line. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > [...] Here is the summary with links: - [net-next] lan78xx: remove redundant statement in lan78xx_get_eee https://git.kernel.org/netdev/net-next/c/9b0f51097147 You are awesome, thank you!
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 5add4145d..a6d653ff5 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1691,8 +1691,6 @@ static int lan78xx_get_eee(struct net_device *net, struct ethtool_eee *edata) ret = lan78xx_read_reg(dev, MAC_CR, &buf); if (buf & MAC_CR_EEE_EN_) { edata->eee_enabled = true; - edata->eee_active = !!(edata->advertised & - edata->lp_advertised); edata->tx_lpi_enabled = true; /* EEE_TX_LPI_REQ_DLY & tx_lpi_timer are same uSec unit */ ret = lan78xx_read_reg(dev, EEE_TX_LPI_REQ_DLY, &buf);
eee_active is set by phy_ethtool_get_eee() already, using the same logic plus an additional check against link speed/duplex values. See genphy_c45_eee_is_active() for details. So we can remove this line. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/usb/lan78xx.c | 2 -- 1 file changed, 2 deletions(-)