diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-07-27 22:31:16 +0400 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-08-24 23:10:18 +0400 |
| commit | f16aeea0e679d5fd43fc02e99569c52d77d5e5d3 (patch) | |
| tree | a22f669f90d69705f56718130744d196876b95c7 /drivers/net/ethernet/sfc/falcon_boards.c | |
| parent | 9714284f83387d330496758e5c10a649fd9a677d (diff) | |
| download | linux-f16aeea0e679d5fd43fc02e99569c52d77d5e5d3.tar.xz | |
sfc: Change state names to be clearer, and comment them
STATE_INIT and STATE_FINI are equivalent and represent incompletely
initialised states; combine them as STATE_UNINIT.
Rename STATE_RUNNING to STATE_READY, to avoid confusion with
netif_running() and IFF_RUNNING.
The comments do not quite match current usage, but this will be
corrected in subsequent fixes.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/falcon_boards.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/falcon_boards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c index 8687a6c3db0d..ec1e99d0dcad 100644 --- a/drivers/net/ethernet/sfc/falcon_boards.c +++ b/drivers/net/ethernet/sfc/falcon_boards.c @@ -380,7 +380,7 @@ static ssize_t set_phy_flash_cfg(struct device *dev, new_mode = PHY_MODE_SPECIAL; if (!((old_mode ^ new_mode) & PHY_MODE_SPECIAL)) { err = 0; - } else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) { + } else if (efx->state != STATE_READY || netif_running(efx->net_dev)) { err = -EBUSY; } else { /* Reset the PHY, reconfigure the MAC and enable/disable |