Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3468ea4c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-disable-aneg-in-genphy_c45_pma_setup_forced' 



Heiner Kallweit says:

====================
net: phy: disable aneg in genphy_c45_pma_setup_forced

When genphy_c45_pma_setup_forced() is called the "aneg enabled" bit
may still be set, therefore clear it. This is also in line with what
genphy_setup_forced() does for Clause 22.

v2:
- fix a typo in patch 1
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e4c076e 30de65c3

drivers/net/phy/marvell10g.c

+2 −7
Original line number Diff line number Diff line
@@ -268,13 +268,8 @@ static int mv3310_config_aneg(struct phy_device *phydev) 
	/* We don't support manual MDI control */

	phydev->mdix_ctrl = ETH_TP_MDI_AUTO;



	if (phydev->autoneg == AUTONEG_DISABLE) {

		ret = genphy_c45_pma_setup_forced(phydev);

		if (ret < 0)

			return ret;



		return genphy_c45_an_disable_aneg(phydev);

	}

	if (phydev->autoneg == AUTONEG_DISABLE)

		return genphy_c45_pma_setup_forced(phydev);



	ret = genphy_c45_an_config_aneg(phydev);

	if (ret < 0)

drivers/net/phy/phy-c45.c

+5 −1
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev) 
	if (ret < 0)

		return ret;



	return phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL2, ctrl2);

	ret = phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL2, ctrl2);

	if (ret < 0)

		return ret;



	return genphy_c45_an_disable_aneg(phydev);

}

EXPORT_SYMBOL_GPL(genphy_c45_pma_setup_forced);