From 1fc61f858bc744b69fa6398f73d15ef8933cfdc8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 5 Jul 2012 17:31:04 +0100 Subject: [PATCH] --- yaml --- r: 315449 b: refs/heads/master c: c2dbab39db1c3c2ccbdbb2c6bac6f07cc7a7c1f6 h: refs/heads/master i: 315447: d8c4eb462d9952548bf203c141770be042ea7652 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/enum.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8ea536f0dbab..35b660b3f01b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7f514af7d6f36bc2f683e04a909c95e4744b95b +refs/heads/master: c2dbab39db1c3c2ccbdbb2c6bac6f07cc7a7c1f6 diff --git a/trunk/drivers/net/ethernet/sfc/enum.h b/trunk/drivers/net/ethernet/sfc/enum.h index d725a8fbe1a6..182dbe2cc6e4 100644 --- a/trunk/drivers/net/ethernet/sfc/enum.h +++ b/trunk/drivers/net/ethernet/sfc/enum.h @@ -136,10 +136,10 @@ enum efx_loopback_mode { * * Reset methods are numbered in order of increasing scope. * - * @RESET_TYPE_INVISIBLE: don't reset the PHYs or interrupts - * @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_INVISIBLE: Reset datapath and MAC (Falcon only) + * @RESET_TYPE_ALL: Reset datapath, MAC and PHY + * @RESET_TYPE_WORLD: Reset as much as possible + * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled * @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