Skip to content

Commit

Permalink
net: phy: Fix the mdix_ctrl changes
Browse files Browse the repository at this point in the history
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: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Raju Lakkaraju authored and David S. Miller committed Dec 1, 2016
1 parent 233275e commit 4e26c5c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/net/phy/marvell.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/microchip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4e26c5c

Please sign in to comment.