Commit b6478b8c authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Paolo Abeni
Browse files

net: phy: c45: add genphy_c45_an_config_eee_aneg() function 



Add new genphy_c45_an_config_eee_aneg() function and replace some of
genphy_c45_write_eee_adv() calls. This will be needed by the next patch.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent e209519b

drivers/net/phy/phy-c45.c

+10 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int genphy_c45_an_config_aneg(struct phy_device *phydev) 
	linkmode_and(phydev->advertising, phydev->advertising,

		     phydev->supported);



	ret = genphy_c45_write_eee_adv(phydev, phydev->supported_eee);

	ret = genphy_c45_an_config_eee_aneg(phydev);

	if (ret < 0)

		return ret;

	else if (ret)
@@ -858,6 +858,15 @@ int genphy_c45_read_eee_abilities(struct phy_device *phydev) 
}

EXPORT_SYMBOL_GPL(genphy_c45_read_eee_abilities);



/**

 * genphy_c45_an_config_eee_aneg - configure EEE advertisement

 * @phydev: target phy_device struct

 */

int genphy_c45_an_config_eee_aneg(struct phy_device *phydev)

{

	return genphy_c45_write_eee_adv(phydev, phydev->supported_eee);

}



/**

 * genphy_c45_pma_read_abilities - read supported link modes from PMA

 * @phydev: target phy_device struct

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ int __genphy_config_aneg(struct phy_device *phydev, bool changed) 
{

	int err;



	err = genphy_c45_write_eee_adv(phydev, phydev->supported_eee);

	err = genphy_c45_an_config_eee_aneg(phydev);

	if (err < 0)

		return err;

	else if (err)

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -1765,6 +1765,7 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, 
int genphy_c45_ethtool_set_eee(struct phy_device *phydev,

			       struct ethtool_eee *data);

int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv);

int genphy_c45_an_config_eee_aneg(struct phy_device *phydev);



/* Generic C45 PHY driver */

extern struct phy_driver genphy_c45_driver;