Commit ebb0346a authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

tg3: simplify tg3_phy_autoneg_cfg 



Make use of ethtool_adv_to_mmd_eee_adv_t() to simplify the code.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8306ee08

drivers/net/ethernet/broadcom/tg3.c

+4 −13
Original line number Diff line number Diff line
@@ -4354,21 +4354,12 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) 
	if (!err) {

		u32 err2;



		if (!tp->eee.eee_enabled)

			val = 0;

		/* Advertise 100-BaseTX EEE ability */

		if (advertise & ADVERTISED_100baseT_Full)

			val |= MDIO_AN_EEE_ADV_100TX;

		/* Advertise 1000-BaseT EEE ability */

		if (advertise & ADVERTISED_1000baseT_Full)

			val |= MDIO_AN_EEE_ADV_1000T;



		if (!tp->eee.eee_enabled) {

			val = 0;

			linkmode_zero(tp->eee.advertised);

		} else {

			mii_eee_cap1_mod_linkmode_t(tp->eee.advertised, val);

		}

		else

			val = ethtool_adv_to_mmd_eee_adv_t(advertise);



		mii_eee_cap1_mod_linkmode_t(tp->eee.advertised, val);

		err = tg3_phy_cl45_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);

		if (err)

			val = 0;