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

Commit 4e26c5c3 authored by Raju Lakkaraju's avatar Raju Lakkaraju Committed by David S. Miller
Browse files

net: phy: Fix the mdix_ctrl changes 



PHY drivers to have an eth_tp_mdix_ctrl to indicate what is the configured
MDI setting, and read eth_tp_mdi to indicate what is the current status,

Add new parameter mdix_ctrl in phy_device structure and fix driver.

Signed-off-by: default avatarRaju Lakkaraju <Raju.Lakkaraju@microsemi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 233275ec

drivers/net/phy/marvell.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int marvell_config_aneg(struct phy_device *phydev) 
	if (err < 0)

		return err;



	err = marvell_set_polarity(phydev, phydev->mdix);

	err = marvell_set_polarity(phydev, phydev->mdix_ctrl);

	if (err < 0)

		return err;
@@ -311,7 +311,7 @@ static int m88e1111_config_aneg(struct phy_device *phydev) 
	 */

	err = phy_write(phydev, MII_BMCR, BMCR_RESET);



	err = marvell_set_polarity(phydev, phydev->mdix);

	err = marvell_set_polarity(phydev, phydev->mdix_ctrl);

	if (err < 0)

		return err;

drivers/net/phy/microchip.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void lan88xx_set_mdix(struct phy_device *phydev) 
	int buf;

	int val;



	switch (phydev->mdix) {

	switch (phydev->mdix_ctrl) {

	case ETH_TP_MDI:

		val = LAN88XX_EXT_MODE_CTRL_MDI_;

		break;