diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-26 13:48:51 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-26 13:48:51 -0800 |
commit | f4bd954e7c24063b15fa9abc8b4b1242772928ed (patch) | |
tree | fc4d54812802e29120ab0e3afac42f4722f0c4ab /drivers/net/sfc | |
parent | 307505e9a4ce0b13b2f996385669039806e07390 (diff) | |
download | kernel_samsung_smdk4412-f4bd954e7c24063b15fa9abc8b4b1242772928ed.zip kernel_samsung_smdk4412-f4bd954e7c24063b15fa9abc8b4b1242772928ed.tar.gz kernel_samsung_smdk4412-f4bd954e7c24063b15fa9abc8b4b1242772928ed.tar.bz2 |
sfc: When disabling the NIC, close the device rather than unregistering it
This should reduce user confusion and may also aid recovery (ioctls
will still be available).
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/efx.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 46c2a8b..5cc59e6 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1332,6 +1332,8 @@ static int efx_net_open(struct net_device *net_dev) EFX_LOG(efx, "opening device %s on CPU %d\n", net_dev->name, raw_smp_processor_id()); + if (efx->state == STATE_DISABLED) + return -EIO; if (efx->phy_mode & PHY_MODE_SPECIAL) return -EBUSY; @@ -1350,10 +1352,12 @@ static int efx_net_stop(struct net_device *net_dev) EFX_LOG(efx, "closing %s on CPU %d\n", net_dev->name, raw_smp_processor_id()); - /* Stop the device and flush all the channels */ - efx_stop_all(efx); - efx_fini_channels(efx); - efx_init_channels(efx); + if (efx->state != STATE_DISABLED) { + /* Stop the device and flush all the channels */ + efx_stop_all(efx); + efx_fini_channels(efx); + efx_init_channels(efx); + } return 0; } @@ -1685,7 +1689,7 @@ static int efx_reset(struct efx_nic *efx) { struct ethtool_cmd ecmd; enum reset_type method = efx->reset_pending; - int rc; + int rc = 0; /* Serialise with kernel interfaces */ rtnl_lock(); @@ -1694,7 +1698,7 @@ static int efx_reset(struct efx_nic *efx) * flag set so that efx_pci_probe_main will be retried */ if (efx->state != STATE_RUNNING) { EFX_INFO(efx, "scheduled reset quenched. NIC not RUNNING\n"); - goto unlock_rtnl; + goto out_unlock; } EFX_INFO(efx, "resetting (%d)\n", method); @@ -1704,7 +1708,7 @@ static int efx_reset(struct efx_nic *efx) rc = falcon_reset_hw(efx, method); if (rc) { EFX_ERR(efx, "failed to reset hardware\n"); - goto fail; + goto out_disable; } /* Allow resets to be rescheduled. */ @@ -1718,28 +1722,23 @@ static int efx_reset(struct efx_nic *efx) /* Leave device stopped if necessary */ if (method == RESET_TYPE_DISABLE) { + efx_reset_up(efx, &ecmd, false); rc = -EIO; - goto fail; + } else { + rc = efx_reset_up(efx, &ecmd, true); } - rc = efx_reset_up(efx, &ecmd, true); - if (rc) - goto disable; - - EFX_LOG(efx, "reset complete\n"); - unlock_rtnl: - rtnl_unlock(); - return 0; - - fail: - efx_reset_up(efx, &ecmd, false); - disable: - EFX_ERR(efx, "has been disabled\n"); - efx->state = STATE_DISABLED; +out_disable: + if (rc) { + EFX_ERR(efx, "has been disabled\n"); + efx->state = STATE_DISABLED; + dev_close(efx->net_dev); + } else { + EFX_LOG(efx, "reset complete\n"); + } +out_unlock: rtnl_unlock(); - efx_unregister_netdev(efx); - efx_fini_port(efx); return rc; } |