diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2016-01-14 21:57:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-15 14:49:11 -0500 |
| commit | 113c74d83eef870e43a0d9279044e9d5435f0d07 (patch) | |
| tree | cedea731fe3c88c4320c58c8e3eac37932ddd08f | |
| parent | 244683749e3c632ab45655098259d5514c179c8a (diff) | |
| download | linux-113c74d83eef870e43a0d9279044e9d5435f0d07.tar.bz2 | |
net: phy: turn carrier off on phy attach
The operstate of a networking device initially IF_OPER_UNKNOWN aka
"unknown", updated on carrier state changes (with carrier state being on
by default). This means it will stay unknown unless the carrier state
goes to off at some point, which is not the case if the phy is already
up/connected at startup.
Explicitly turn off the carrier on phy attach, leaving the phy state
machine to turn the carrier on when it has done the initial negotiation.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phy_device.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 903737adfc01..bad3f005faee 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -901,6 +901,11 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, phydev->state = PHY_READY; + /* Initial carrier state is off as the phy is about to be + * (re)initialized. + */ + netif_carrier_off(phydev->attached_dev); + /* Do initial configuration here, now that * we have certain key parameters * (dev_flags and interface) |