diff options
| author | Steve Hodgson <shodgson@solarflare.com> | 2009-12-23 13:46:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 19:09:04 -0800 |
| commit | ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4 (patch) | |
| tree | a9bede7f0b4552a00add40bdfb21f3f9e5c4e9b7 /drivers/net/sfc/efx.c | |
| parent | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (diff) | |
| download | linux-3.10-ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4.tar.gz linux-3.10-ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4.tar.bz2 linux-3.10-ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4.zip | |
sfc: Move PHY software state initialisation from init() into probe()
This prevents efx->link_advertising from being blatted during
a reset.
The phy_short_reach sysfs node is now destroyed later in the
port shutdown process, so check for STATE_RUNNING after
acquiring the rtnl_lock (just like in set_phy_flash_cfg).
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/efx.c')
| -rw-r--r-- | drivers/net/sfc/efx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index f983e3b507c..103e8b0e2a0 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -741,14 +741,14 @@ static int efx_probe_port(struct efx_nic *efx) EFX_LOG(efx, "create port\n"); + if (phy_flash_cfg) + efx->phy_mode = PHY_MODE_SPECIAL; + /* Connect up MAC/PHY operations table */ rc = efx->type->probe_port(efx); if (rc) goto err; - if (phy_flash_cfg) - efx->phy_mode = PHY_MODE_SPECIAL; - /* Sanity check MAC address */ if (is_valid_ether_addr(efx->mac_address)) { memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN); |