diff options
author | David S. Miller | 2017-12-17 04:11:55 +0100 |
---|---|---|
committer | David S. Miller | 2017-12-17 04:11:55 +0100 |
commit | c30abd5e40dd863f88e26be09b6ce949145a630a (patch) | |
tree | 5b25362084308502a336d8da26b8dc7430d7c812 /drivers/net/phy/marvell.c | |
parent | net: phy: broadcom: Add entry for 5395 switch PHYs (diff) | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
download | kernel-qcow2-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.gz kernel-qcow2-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz kernel-qcow2-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell.c')
-rw-r--r-- | drivers/net/phy/marvell.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 6dbb0f4c34eb..2fc026dc170a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -637,6 +637,10 @@ static int m88e1510_config_aneg(struct phy_device *phydev) if (err < 0) goto error; + /* Do not touch the fiber page if we're in copper->sgmii mode */ + if (phydev->interface == PHY_INTERFACE_MODE_SGMII) + return 0; + /* Then the fiber link */ err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); if (err < 0) |