summaryrefslogtreecommitdiffstats
path: root/net/dsa/slave.c
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2014-10-02 18:56:03 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-04 20:44:44 -0400
commitf7d6b96f345be7e0bd8f7651f7fe1efa5404c1e3 (patch)
tree4d941d54f12e670bda8a976549b20ed8e755107a /net/dsa/slave.c
parentdd3619f2ed5bd5ffce90f4fd8361ccd46d59b9b6 (diff)
downloadlinux-stable-f7d6b96f345be7e0bd8f7651f7fe1efa5404c1e3.tar.gz
linux-stable-f7d6b96f345be7e0bd8f7651f7fe1efa5404c1e3.tar.bz2
linux-stable-f7d6b96f345be7e0bd8f7651f7fe1efa5404c1e3.zip
net: dsa: do not call phy_start_aneg
Commit f7f1de51edbd ("net: dsa: start and stop the PHY state machine") add calls to phy_start() in dsa_slave_open() respectively phy_stop() in dsa_slave_close(). We also call phy_start_aneg() in dsa_slave_create(), and this call is messing up with the PHY state machine, since we basically start the auto-negotiation, and later on restart it when calling phy_start(). phy_start() does not currently handle the PHY_FORCING or PHY_AN states properly, but such a fix would be too invasive for this window. Fixes: f7f1de51edbd ("net: dsa: start and stop the PHY state machine") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r--net/dsa/slave.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 36953c84ff2d..8030489d9cbe 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -608,7 +608,6 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
p->phy->speed = 0;
p->phy->duplex = 0;
p->phy->advertising = p->phy->supported | ADVERTISED_Autoneg;
- phy_start_aneg(p->phy);
}
return slave_dev;