diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:37:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:37:16 -0800 |
| commit | 167c6274c30d17c41742096d1a12c32bd3b7e366 (patch) | |
| tree | b28b98e34dd2b98db6fff8459cddbc65142cd891 /drivers/net/sfc/enum.h | |
| parent | 5c7f0333584128c745fbda845abbe3a32c22d467 (diff) | |
| parent | a8272061fe533f6d0261b38c58c93bd0855baebe (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 cec15dbb88e..41e758e8fdb 100644 --- a/drivers/net/sfc/enum.h +++ b/drivers/net/sfc/enum.h @@ -72,7 +72,7 @@ extern const char *efx_loopback_mode_names[]; * @RESET_TYPE_ALL: reset everything but PCI core blocks * @RESET_TYPE_WORLD: reset everything, save & restore PCI config * @RESET_TYPE_DISABLE: disable NIC - * @RESET_TYPE_MONITOR: reset due to hardware monitor + * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog * @RESET_TYPE_INT_ERROR: reset due to internal error * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors * @RESET_TYPE_RX_DESC_FETCH: pcie error during rx descriptor fetch @@ -86,7 +86,7 @@ enum reset_type { RESET_TYPE_WORLD = 2, RESET_TYPE_DISABLE = 3, RESET_TYPE_MAX_METHOD, - RESET_TYPE_MONITOR, + RESET_TYPE_TX_WATCHDOG, RESET_TYPE_INT_ERROR, RESET_TYPE_RX_RECOVERY, RESET_TYPE_RX_DESC_FETCH, |