diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-09-01 07:49:08 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-03 09:53:49 -0400 |
commit | 3c78708fe83d0fff994683e396e28ef259b7497b (patch) | |
tree | d4f446406f548a6c08b56a2b72d7288d2cf48fa2 /drivers/net/sfc/net_driver.h | |
parent | 8c8661e4cefdd1ddbfe7d5120f046694555d9e5c (diff) |
sfc: Remove the STATE_RESETTING flag
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>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 531d939b574f..567df00090fb 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -459,8 +459,7 @@ enum nic_state { | |||
459 | STATE_INIT = 0, | 459 | STATE_INIT = 0, |
460 | STATE_RUNNING = 1, | 460 | STATE_RUNNING = 1, |
461 | STATE_FINI = 2, | 461 | STATE_FINI = 2, |
462 | STATE_RESETTING = 3, /* rtnl_lock always held */ | 462 | STATE_DISABLED = 3, |
463 | STATE_DISABLED = 4, | ||
464 | STATE_MAX, | 463 | STATE_MAX, |
465 | }; | 464 | }; |
466 | 465 | ||