aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ethoc.c
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2014-02-04 03:33:09 +0400
committerDavid S. Miller <davem@davemloft.net>2014-02-04 20:19:51 -0800
commit445a48cc9df90775d6479ef4c73d3a90184af4ed (patch)
tree093387cda8a582e13745d26f53e6a068ba1d3fda /drivers/net/ethernet/ethoc.c
parentnet: phy: ensure Gigabit features are masked off if requested (diff)
downloadlinux-dev-445a48cc9df90775d6479ef4c73d3a90184af4ed.tar.xz
linux-dev-445a48cc9df90775d6479ef4c73d3a90184af4ed.zip
net: ethoc: don't advertise gigabit speed on attached PHY
OpenCores 10/100 Mbps MAC does not support speeds above 100 Mbps, but does not disable advertisement when PHY supports them. This results in non-functioning network when the MAC is connected to a gigabit PHY connected to a gigabit switch. The fix is to disable gigabit speed advertisement on attached PHY unconditionally. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ethoc.c')
-rw-r--r--drivers/net/ethernet/ethoc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index f9c1cf536298..0a8533c0c01a 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -691,6 +691,11 @@ static int ethoc_mdio_probe(struct net_device *dev)
}
priv->phy = phy;
+ phy->advertising &= ~(ADVERTISED_1000baseT_Full |
+ ADVERTISED_1000baseT_Half);
+ phy->supported &= ~(SUPPORTED_1000baseT_Full |
+ SUPPORTED_1000baseT_Half);
+
return 0;
}