redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

sfc: Remove the STATE_RESETTING flag

Browse source 
This was originally a kludge to fix broken locking, which has since
been fixed properly.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Ben Hutchings 2008-09-01 12:49:08 +01:00 committed by Jeff Garzik
parent 8c8661e4ce
commit 3c78708fe8
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/sfc/efx.c
View file

@ -140,8 +140,7 @@ static void efx_fini_channels(struct efx_nic *efx);
#define EFX_ASSERT_RESET_SERIALISED(efx) \
do { \
if ((efx->state == STATE_RUNNING) || \
(efx->state == STATE_RESETTING)) \
if (efx->state == STATE_RUNNING) \
ASSERT_RTNL(); \
} while (0)
@ -1615,7 +1614,6 @@ static int efx_reset(struct efx_nic *efx)
goto unlock_rtnl;
}
efx->state = STATE_RESETTING;
EFX_INFO(efx, "resetting (%d)\n", method);
efx_reset_down(efx, &ecmd);
@ -1646,7 +1644,6 @@ static int efx_reset(struct efx_nic *efx)
goto disable;
EFX_LOG(efx, "reset complete\n");
efx->state = STATE_RUNNING;
unlock_rtnl:
rtnl_unlock();
return 0;

3
drivers/net/sfc/net_driver.h
View file

@ -459,8 +459,7 @@ enum nic_state {
STATE_INIT = 0,
STATE_RUNNING = 1,
STATE_FINI = 2,
STATE_RESETTING = 3, /* rtnl_lock always held */
STATE_DISABLED = 4,
STATE_DISABLED = 3,
STATE_MAX,
};