diff options
| author | Steve Hodgson <shodgson@solarflare.com> | 2009-12-23 14:46:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-24 04:09:04 +0100 |
| commit | ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4 (patch) | |
| tree | a9bede7f0b4552a00add40bdfb21f3f9e5c4e9b7 /drivers/net/sfc/falcon.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-ff3b00a0fcaab89ff885e9f0f4ad83c4ced788f4.tar.xz linux-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/falcon.c')
| -rw-r--r-- | drivers/net/sfc/falcon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 17afcd26e870..9d009c46e962 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -925,6 +925,7 @@ static int falcon_probe_port(struct efx_nic *efx) static void falcon_remove_port(struct efx_nic *efx) { + efx->phy_op->remove(efx); efx_nic_free_buffer(efx, &efx->stats_buffer); } |