summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-11-05 19:47:28 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-06 15:06:28 -0500
commitb31f65fb4383a49bdcfa465176754b37e44e1e17 (patch)
treea7885358f08a9e2b714aca0386f91ca825ce266d /net
parent5816c3dafb6c63fd5c7b9f3f707c8565811d9916 (diff)
downloadlinux-b31f65fb4383a49bdcfa465176754b37e44e1e17.tar.gz
linux-b31f65fb4383a49bdcfa465176754b37e44e1e17.tar.bz2
linux-b31f65fb4383a49bdcfa465176754b37e44e1e17.zip
net: dsa: slave: Fix autoneg for phys on switch MDIO bus
When the ports phys are connected to the switches internal MDIO bus, we need to connect the phy to the slave netdev, otherwise auto-negotiation etc, does not work. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dsa/slave.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 6d1817449c36..ab03e00ffe8f 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -489,11 +489,14 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p,
/* We could not connect to a designated PHY, so use the switch internal
* MDIO bus instead
*/
- if (!p->phy)
+ if (!p->phy) {
p->phy = ds->slave_mii_bus->phy_map[p->port];
- else
+ phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
+ p->phy_interface);
+ } else {
pr_info("attached PHY at address %d [%s]\n",
p->phy->addr, p->phy->drv->name);
+ }
}
int dsa_slave_suspend(struct net_device *slave_dev)