diff options
author | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-06 22:01:18 -0500 |
commit | 4e84b496fd2a226883920e0e0de4ed3f94898adf (patch) | |
tree | 662e314870fabf5d6e3bf25b955bd537eb72de54 /net/dsa | |
parent | 5c91ae08e4500ebc8efd584c8b87c4040d5393ea (diff) | |
parent | 9d01412ae76fec5274a3d94a28a3552a742a60dc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/dsa')
-rw-r--r-- | net/dsa/slave.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 474f2962590a..0ea466dad818 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -553,11 +553,14 @@ static void dsa_slave_phy_setup(struct dsa_slave_priv *p, | |||
553 | /* We could not connect to a designated PHY, so use the switch internal | 553 | /* We could not connect to a designated PHY, so use the switch internal |
554 | * MDIO bus instead | 554 | * MDIO bus instead |
555 | */ | 555 | */ |
556 | if (!p->phy) | 556 | if (!p->phy) { |
557 | p->phy = ds->slave_mii_bus->phy_map[p->port]; | 557 | p->phy = ds->slave_mii_bus->phy_map[p->port]; |
558 | else | 558 | phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link, |
559 | p->phy_interface); | ||
560 | } else { | ||
559 | pr_info("attached PHY at address %d [%s]\n", | 561 | pr_info("attached PHY at address %d [%s]\n", |
560 | p->phy->addr, p->phy->drv->name); | 562 | p->phy->addr, p->phy->drv->name); |
563 | } | ||
561 | } | 564 | } |
562 | 565 | ||
563 | int dsa_slave_suspend(struct net_device *slave_dev) | 566 | int dsa_slave_suspend(struct net_device *slave_dev) |