Skip to content

Commit a28c6d0

Browse files
committed
tg3: simplify tg3_phy_autoneg_cfg
JIRA: https://issues.redhat.com/browse/RHEL-52671 JIRA: https://issues.redhat.com/browse/RHEL-52757 commit ebb0346 Author: Heiner Kallweit <hkallweit1@gmail.com> Date: Sun Feb 18 19:04:42 2024 +0100 tg3: simplify tg3_phy_autoneg_cfg Make use of ethtool_adv_to_mmd_eee_adv_t() to simplify the code. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org> Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
1 parent d639f49 commit a28c6d0

File tree

1 file changed

+4
-13
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+4
-13
lines changed

drivers/net/ethernet/broadcom/tg3.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4354,21 +4354,12 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
43544354
if (!err) {
43554355
u32 err2;
43564356

4357-
val = 0;
4358-
/* Advertise 100-BaseTX EEE ability */
4359-
if (advertise & ADVERTISED_100baseT_Full)
4360-
val |= MDIO_AN_EEE_ADV_100TX;
4361-
/* Advertise 1000-BaseT EEE ability */
4362-
if (advertise & ADVERTISED_1000baseT_Full)
4363-
val |= MDIO_AN_EEE_ADV_1000T;
4364-
4365-
if (!tp->eee.eee_enabled) {
4357+
if (!tp->eee.eee_enabled)
43664358
val = 0;
4367-
linkmode_zero(tp->eee.advertised);
4368-
} else {
4369-
mii_eee_cap1_mod_linkmode_t(tp->eee.advertised, val);
4370-
}
4359+
else
4360+
val = ethtool_adv_to_mmd_eee_adv_t(advertise);
43714361

4362+
mii_eee_cap1_mod_linkmode_t(tp->eee.advertised, val);
43724363
err = tg3_phy_cl45_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);
43734364
if (err)
43744365
val = 0;

0 commit comments

Comments
 (0)