diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-11-04 15:35:36 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-11-06 00:50:15 -0500 |
commit | 739bb23d722313e37322f485eb65f700b060d817 (patch) | |
tree | acc5e4f896104098ad415289682ab0cbf532af3b /drivers/net/sfc/enum.h | |
parent | 3e133c44d24a094118caee182200462d46c55b56 (diff) |
sfc: Do not reset when hardware monitor detects a fault
The TX watchdog should trigger a reset, but a temperature/power alarm
should not as this is unlikely to solve the problem.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/enum.h')
-rw-r--r-- | drivers/net/sfc/enum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/enum.h b/drivers/net/sfc/enum.h index cec15dbb88e4..41e758e8fdb1 100644 --- a/drivers/net/sfc/enum.h +++ b/drivers/net/sfc/enum.h | |||
@@ -72,7 +72,7 @@ extern const char *efx_loopback_mode_names[]; | |||
72 | * @RESET_TYPE_ALL: reset everything but PCI core blocks | 72 | * @RESET_TYPE_ALL: reset everything but PCI core blocks |
73 | * @RESET_TYPE_WORLD: reset everything, save & restore PCI config | 73 | * @RESET_TYPE_WORLD: reset everything, save & restore PCI config |
74 | * @RESET_TYPE_DISABLE: disable NIC | 74 | * @RESET_TYPE_DISABLE: disable NIC |
75 | * @RESET_TYPE_MONITOR: reset due to hardware monitor | 75 | * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog |
76 | * @RESET_TYPE_INT_ERROR: reset due to internal error | 76 | * @RESET_TYPE_INT_ERROR: reset due to internal error |
77 | * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors | 77 | * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors |
78 | * @RESET_TYPE_RX_DESC_FETCH: pcie error during rx descriptor fetch | 78 | * @RESET_TYPE_RX_DESC_FETCH: pcie error during rx descriptor fetch |
@@ -86,7 +86,7 @@ enum reset_type { | |||
86 | RESET_TYPE_WORLD = 2, | 86 | RESET_TYPE_WORLD = 2, |
87 | RESET_TYPE_DISABLE = 3, | 87 | RESET_TYPE_DISABLE = 3, |
88 | RESET_TYPE_MAX_METHOD, | 88 | RESET_TYPE_MAX_METHOD, |
89 | RESET_TYPE_MONITOR, | 89 | RESET_TYPE_TX_WATCHDOG, |
90 | RESET_TYPE_INT_ERROR, | 90 | RESET_TYPE_INT_ERROR, |
91 | RESET_TYPE_RX_RECOVERY, | 91 | RESET_TYPE_RX_RECOVERY, |
92 | RESET_TYPE_RX_DESC_FETCH, | 92 | RESET_TYPE_RX_DESC_FETCH, |