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) | |
| download | op-kernel-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.zip op-kernel-dev-4e84b496fd2a226883920e0e0de4ed3f94898adf.tar.gz | |
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 474f296..0ea466d 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, /* 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) |
